diff --git a/Makefile b/Makefile index 27d41069c6f91b5035c07631b0c55277c1ca2ad2..1c1e705e042758ade5296a580790ecc9409332ea 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ TRANSLATIONS=$(call wildcard,language/en*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) TRANSLATIONS_ADV=$(subst $(BASE),$(BASE_ADV),$(TRANSLATIONS)) INDEXFILES=language/index.html $(call wildcard,language/**/index.html) $(call wildcard,elements/*.html) ELEMENTS=$(call wildcard,elements/*.php) +FIELDS=$(call wildcard,fields/*.php) ZIPFILE=plg_$(ZIPBASE)_$(BASE)_v$(VERSION).zip ZIPFILE_ADV=plg_$(ZIPBASE)_$(BASE_ADV)_v$(VERSION).zip @@ -27,8 +28,8 @@ translations: $(TRANSLATIONS) zip: $(PLUGINFILES) $(TRANSLATIONS) $(ADVANCEDFILES) @echo "Packing all files into distribution file $(ZIPFILE):" - @zip -r $(ZIPFILE) $(PLUGINFILES) $(TRANSLATIONS) $(ELEMENTS) $(INDEXFILES) - @zip -r $(ZIPFILE_ADV) $(PLUGINFILES_ADV) $(TRANSLATIONS_ADV) $(ELEMENTS) $(INDEXFILES) + @zip -r $(ZIPFILE) $(PLUGINFILES) $(TRANSLATIONS) $(ELEMENTS) $(FIELDS) $(INDEXFILES) + @zip -r $(ZIPFILE_ADV) $(PLUGINFILES_ADV) $(TRANSLATIONS_ADV) $(ELEMENTS) $(FIELDS) $(INDEXFILES) clean: rm -f $(ZIPFILE) $(ZIPFILE_ADV) diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip index a000b29d74a1ec8e8f00baa2576f24d8e4b2519c..6ff290ef99325ce4dd84041aa2e2be06928e30f7 100644 Binary files a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip differ diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip index 519228940b6b6bcd4b8442ca82c1b7e89aab2c66..aef08aa20faea801a7f3c2b29e26b89503f47a2e 100644 Binary files a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 8a3adeb3b0f81bf7f89e544b821388f59d3c9438..04a934246547a2a00ff928b9535541768794e2ce 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -22,7 +22,7 @@ <scriptfile>rules_shipping.script.php</scriptfile> <!-- VM 3.x support (fields rather than params): --> - <vmconfig> + <config> <fields name="params" addfieldpath="/plugins/vmshipment/rules_shipping/fields"> <fieldset name="shipment" label="VMSHIPMENT_RULES_PLUGIN" addfieldpath="/administrator/components/com_virtuemart/fields"> <field type="vmcurl"/> @@ -86,7 +86,7 @@ </fieldset> </fields> - </vmconfig> + </config> <!-- VM 2.0 support (params rather than fields): --> diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index 79819107a4d4bda54ae98a015fb733dd17322d9a..7f73cc78d06a406754be4a0194457d37e6c51c6b 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -22,7 +22,7 @@ <scriptfile>rules_shipping_advanced.script.php</scriptfile> <!-- VM 3.0 support (fields rather than params): --> - <vmconfig> + <config> <fields name="params" addfieldpath="/plugins/vmshipment/rules_shipping/fields"> <fieldset name="shipment" label="VMSHIPMENT_RULES_PLUGIN_ADV" addfieldpath="/administrator/components/com_virtuemart/fields"> <field type="vmcurl"/> @@ -86,7 +86,7 @@ </fieldset> </fields> - </vmconfig> + </config> <!-- VM 2.0 support (params rather than fields): -->