diff --git a/.gitignore b/.gitignore index 440d3059cc9f787d9d69301ce74d4c0f04cd49fa..3ec0a7b42c4d69066870c9dfc2a353e57bbef426 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ sync.sh Material +.build diff --git a/Makefile b/Makefile index b0a5abe7ce77ee7a4ab2803e91220aaab27d3e61..8b1254e6bdfcc8e86e01c198816e0212669dd9bf 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ BASICBUILDDIR=$(VENDOR)-$(PLATTFORM)-$(BASE)-basic ADVBUILDDIR=$(VENDOR)-$(PLATTFORM)-$(BASE)-advanced PLUGINFILES=library assets includes LICENSE.txt -BASICPLUGINFILES=shipping-by-rules.php readme.txt -ADVPLUGINFILES=advanced-shipping-by-rules.php readme-adv.txt +BASICPLUGINFILES=woocommerce-shipping-by-rules.php readme.txt +ADVPLUGINFILES=woocommerce-advanced-shipping-by-rules.php readme-adv.txt opentools-update-checker.php plugin-update-checker TRANSLATIONS= @@ -35,7 +35,7 @@ zip: $(PLUGINFILES) $(ADVPLUGINFILES) $(BASICPLUGINFILES) $(TRANSLATIONS) cd $(DIR) clean: - rm -f $(ZIPFILE) $(ADVZIPFILE) $(BUILDDIR) $(ADVBUILDDIR) + rm -rf $(ZIPFILE) $(ADVZIPFILE) $(BUILDDIR) $(ADVBUILDDIR) $(SVNDIR)/tags/$(VERSION) : cd $(SVNDIR) && svn cp trunk tags/$(VERSION) diff --git a/readme.txt b/readme.txt index c92c6ba3ce3ae343d13087210dd61209a5072c74..b86311fe03facc3e0f56c7fa472ffe40a61b67d4 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -=== WooCommerce Basic Ordernumbers === +=== WooCommerce Shipping by Rules === Contributors: opentools Tags: WooCommerce, Shipment, Shipping Requires at least: 4.0 @@ -7,11 +7,12 @@ Stable tag: 1.0 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl.html -Describe shipping costs with general rules on the order properties. Very complex shipping cost structures (depending on the amount, postal code, weight, number of products and/or articles etc.) can be easily implemented. +Describe (even complex) shipping costs with simple general rules on the order properties (amount, postcode, weight, #products and/or articles etc.). == Description == Determine shipping costs according to general conditions (bounds on the order properties). Shipping costs can depend on e.g.: + * Total amount of the order * Total weight of the order * Number of articles or different products in the order @@ -29,7 +30,7 @@ Each rule is described as one line of text with an easy structure (semicolons se This set of rules describes three shipping costs: Orders of 100€ and more are free, otherwise orders with less than five articles have shipping costs of 1.5€, all others 3.50€. -=== Limitations and common misconceptions === += Limitations and common misconceptions = * The plugin is not designed to calculte shipping costs on a per-product level (e.g. it is not possible that Article A has shipping costs of 3€, Article B 5€ and if you order both you pay 8€ shipping) * The plugin allows only limited support for category-based shipping. You can only find out if an article from a particular category is in the order, but NOT how many articles from a given category (e.g. it is not possible to have all articles from Category X ship for 3€ and all articles from Category Y ship for 5€) @@ -60,6 +61,7 @@ The Advanced Ordernumbers for WooCommerce plugin supports some invoicing plugins == Screenshots == +* == Changelog ==