Commit Graph

64 Commits

Author SHA1 Message Date
Mike Jolley 5e6405b650 Merge branch 'master' into update/13359 2018-06-15 15:12:12 +01:00
Khan M Rashedun-Naby 8d7ae8b413 Remove unused variable and unnecesary else if 2018-06-09 23:24:08 +06:00
Mike Jolley 2cad2414b3 Remove manual wc_reduce_stock_levels calls 2018-06-07 18:01:38 +01:00
Mike Jolley ad10e846ea get_canonical_package_rate_ids should check it has an array 2018-05-25 12:54:58 +01:00
Mike Jolley d02106f697 Merge branch 'master' into pr/18596 2018-04-03 16:24:19 +01:00
Claudio Sanches 0660a50e07 Removed obvious boolean results 2018-03-21 19:57:10 -03:00
Rodrigo Primo cdf8b483a1 phpcs fixes in includes/gateways/cod/class-wc-gateway-cod.php 2018-03-09 15:44:48 -03:00
Rodrigo Primo 8678ed8685 Fix phpcs violations using phpcbf 2018-03-09 09:53:10 -03:00
Manos Psychogyiopoulos 690c7a9753 Check if paying for an existing order before looking at cart contents
Resolves a bug causing this logic to ignore the `order-pay` query var presence if the cart is populated with items.
2018-01-25 16:42:54 +02:00
Manos Psychogyiopoulos d10987d813 Match saved (canonical) rate IDs against chosen rates
Generates canonical rate IDs (`method_id:instance_id`) from package rates and order shipping line items.

Requires https://github.com/woocommerce/woocommerce/pull/18483
2018-01-25 16:40:31 +02:00
Manos Psychogyiopoulos d86a948f04 Add method instances in COD, grouped by method 2018-01-25 16:37:10 +02:00
James Allan f6eb02806b Mark orders as payment complete if the order total is 0
Similar to how other payment gateways like Stripe call
payment_complete on orders with $0 totals.
2017-11-30 13:31:10 +10:00
Mike Jolley 982edb2f9f Improves cash on delivery logic when dealing with multiple methods
If an order has multiple shipping methods, check all against the
allowed methods using a simple array_diff.
2017-07-13 16:21:59 +01:00
Beka Rice 1f95709e42 Fix deprecation notice from accessing order props directly 2017-07-13 09:56:46 -04:00
Mike Jolley b8eafe985e Set defaults to avoid error if too few args passed 2017-06-15 15:43:32 +01:00
Mike Jolley 55e9add8e5 More strict COD method matching
Fixes #15606
2017-06-14 12:17:28 +01:00
Mike Jolley 20637e53b8 For COD orders, force payment complete status to be completed. 2017-05-24 18:48:34 +01:00
Claudio Sanches 61b39c206f Removed default instructions, closes #12853 2017-01-17 16:11:49 -02:00
Mike Jolley 56fef5b4f6 More styling settings tweaks 2016-12-21 11:36:48 +00:00
Claudio Sanches 07ae13c51b Fixed coding standards recommended by WPCS 2016-10-13 16:51:18 -03:00
Attila Donáth 2968850786 Setup general properties in a separate method #12085
It is easier to extend the gateway class like that.
2016-10-13 18:23:51 +02:00
Attila Donáth 14f563fe02 Eliminate hardcoded payment method IDs #12085 2016-10-13 18:23:41 +02:00
Claudio Sanches 657c312cae Fix strings case (#12069)
* Fixed case for all _e, esc_attr_e and esc_html_e strings

* Fixed case for all _n_noop strings

* Fixed case for all _x strings

* Fixed case for all __, esc_html__ and esc_attr__ strings

* Fixed a few more strings

* Fixed strings in unit tests

* Fix PayPal Standard case.

* Save Order text
2016-10-12 11:16:30 +01:00
Rami Yushuvaev 83e938af1e i18n: Merge similar translation strings to reduce the total strings count #11905 2016-10-11 04:39:13 +03:00
Mike Jolley 9cca27f21e Take out admin check
@justinshreve I’m not sure why we had the admin check there, but I’ve
removed it because the setting of WP_ADMIN was breaking unrelated unit
tests. I think we should leave constants alone if possible and just
modify gateways.
2016-09-07 12:37:39 +01:00
Aristeides Stathopoulos f2730eea02 WordPress.WhiteSpace.ControlStructureSpacing.BlankLineAfterEnd 2016-08-27 08:57:05 +03:00
Aristeides Stathopoulos b063bcfe4c last item in a multiline-array should end in a comma 2016-08-27 04:46:45 +03:00
Mike Jolley 95b11606fc get_product_from_item -> get_product 2016-08-22 16:51:24 +01:00
Mike Jolley f4a4f6c361 Reduce stock and other notices 2016-08-09 14:15:04 +01:00
Mike Jolley 7685587b22 payment_method 2016-08-05 16:04:41 +01:00
Mike Jolley fce7771d82 Fix - Shipping method title display in COD settings. 2016-07-20 10:49:27 +01:00
Claudio Sanches 7d9d091767 Fixed mixed tabs and spaces 2016-07-11 16:56:35 +02:00
Mike Jolley 7a2e460206 COD: use on-hold if order contains download
Fixes #11015
2016-06-01 11:27:54 +01:00
Mike Jolley 29d35151a1 woocommerce_cod_process_payment_order_status filter
Closes #10522
2016-03-10 12:30:42 +00:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Ewout Fernhout ab85ebfbc4 check if product exists
fixes #9363
2015-10-15 09:43:53 +02:00
Mike Jolley a0be65596f COD: remove shipping check if the cart is 100% virtual.
@claudiosmweb
2015-08-13 23:54:16 +01:00
MindyPostoff 7418fd6c8d Update class-wc-gateway-cod.php
Prevent confusion that "Enable COD for virtual orders" will actually enable the payment method
2015-04-22 16:41:51 -04:00
Mike Jolley 50c6e1e4a0 select2 settings 2015-01-12 16:29:01 +00:00
Mike Jolley 626d7f4256 Moved email methods to emails class 2014-11-26 00:03:00 +00:00
shivapoudel bc5156ff4a Absolute path and Indentation fix for includes/gateways/*.php :) 2014-09-21 01:27:58 +05:45
Barry Kooij 6655188f0b Changed use of get_order with wc_get_order 2014-08-15 14:29:21 +02:00
Coen Jacobs 89ea6c46ab Replace new WC_Order calls with get_order 2014-06-13 15:24:51 +02:00
Coen Jacobs 3ad8935b20 Removed ununsed global variables in local scopes 2014-06-08 22:33:11 +02:00
Mike Jolley 4fa5ec8310 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	includes/gateways/cod/class-wc-gateway-cod.php
2014-05-08 15:06:20 +01:00
Mike Jolley 1308662946 Option to toggle enable_for_virtual for COD, rather than just doing it.
Closes #5399
2014-05-08 15:05:34 +01:00
Mike Jolley a4b6c4eb4f Merge pull request #5415 from tamarazuk/patch-2
COD: no need to hide in admin
2014-05-08 15:04:55 +01:00
Mike Jolley 53deeb4be5 Cleaned up logic in email_instructions functions for @splashingpixels 2014-05-07 15:54:22 +01:00
Tamara Zuk a9ebcdd8c6 COD: check if cart is available before checking if it needs shipping 2014-05-06 16:04:25 -04:00
tamarazuk ec1b16340b COD: no need to hide in admin
Also fixes a fatal error when WC()->payment_gateways()->get_available_payment_gateways() is called in the admin
2014-05-03 01:32:37 -04:00