Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,313 Commits 1,126 Branches 784 Tags 951 MiB
Commit Graph

581 Commits

Author SHA1 Message Date
Mike Jolley c757fd9940 Merge branch 'shipping-zone-modals' 
# Conflicts:
#	assets/css/admin.css
#	assets/css/admin.scss
 2016-03-31 15:20:06 +01:00
Mike Jolley 84d3fe2d82 wc_format_localized_decimal on dimensions 2016-03-30 13:19:01 +01:00
Mike Jolley 975f9d8c2d Remove nonce on cancel order URL 
Nonces are invalid if the user ID changes during checkout e.g. through
registration. Cancel links are invalid.

cc @claudiosmweb

Fixes #10605
 2016-03-30 12:45:25 +01:00
Mike Jolley 5f6aa6c160 Fix modals and ajax events 2016-03-24 19:06:51 +00:00
Mike Jolley 8b53d1a618 Only load modal if supported 2016-03-24 18:31:39 +00:00
Mike Jolley d3ac3f4073 Modals first pass 2016-03-24 17:26:40 +00:00
Mike Jolley dd68a57fff Merge pull request #10592 from woothemes/item-box-tweaks 
Order Item Meta Box Tweaks
 2016-03-23 15:03:24 +00:00
Joey Kudish bde619c4d6 Fix for older versions of php 
Older versions of php cannot check `empty()` with a non-variable. Fixes
fatal introduced in 1d35fd6d73
 2016-03-22 17:36:24 -07:00
Mike Jolley f73149feaf Tweak variation display and reenable bulk editing 2016-03-22 17:13:39 +00:00
Mike Jolley 8d76396eaf Merge pull request #10588 from justinshreve/payment-tokens-wc-data 
Convert WC_Payment_Tokens to use the new WC_Data
 2016-03-22 14:14:29 +00:00
Justin Shreve 1d35fd6d73 Convert WC_Payment_Tokens (and CC/eCheck tokens) to use the new WC_Data and meta handling code. 2016-03-21 11:06:17 -07:00
Mike Jolley 7be2b129b6 Removed bulk actions from order items panel 
Reduce/increase order item stock is less important these days do to
automatic stock reduction (when status changes) and because when you
refund items you can restock items via checkbox. Manual stock changes
can be performed by editing products.

Decreases complexity of order items box.
 2016-03-21 14:58:14 +00:00
Justin Shreve 705213d4f5 Move meta_id into the _meta_data array instead of trying to use them as array keys. 
This is so we can just use PHP's keys, instead of trying to add new meta and guess an avaible key.
 2016-03-18 12:24:35 -07:00
Mike Jolley c25ef5e55a Adjust OR logic 
#10568
 2016-03-17 17:54:09 +00:00
Mike Jolley 12e23bb143 Adjust related query nesting 
Fixes #10568
 2016-03-17 16:02:33 +00:00
Mike Jolley 6765967be8 Add data and tostring handling to WC_Data 2016-03-17 15:22:29 +00:00
Justin Shreve a51e164fd7 Set versions to 2.6 2016-03-15 15:44:04 -07:00
Justin Shreve 9aff45e154 Feedback 2016-03-15 15:11:07 -07:00
Justin Shreve 5d6cdd05f1 Finish out tests, make sure to use cprrect meta ID field in order by clause. 2016-03-14 11:12:47 -07:00
Justin Shreve 97c0edf445 Start on tests for testing CRUD meta. 
Includes Mock object for testing against the abstract WC_Data.
 2016-03-14 11:12:47 -07:00
Justin Shreve f572a887e0 New Abstract WC_Data Class 2016-03-14 11:12:47 -07:00
Justin Shreve 5dbfc7ae16 Fix Payment Token 'set default' methods. Makes sure we are using the user ID of the payment token, and not the current user. 
Also makes sure to properly unset other tokens when a new one is set as default. Finally, we make sure that a user is always set in our payment token tests (which was broken in some WP versions which alerted us to some broken tests).
 2016-03-14 09:41:37 -07:00
Mike Jolley c573a5b75f Only add product line if product exists. 
Fixes #10556
 2016-03-14 15:40:58 +00:00
Mike Jolley 807b860a6c Merge pull request #10514 from SiR-DanieL/email-items-type 
Added bool param for email order items hooks
 2016-03-09 12:00:11 +00:00
Mike Jolley 55918626f5 [2.5] Update date for paid orders during non-manual updates only 
Fixes #10510
 2016-03-09 11:58:44 +00:00
Nicola Mustone c7756187e0 Added bool param for email order items hooks 2016-03-09 12:55:28 +01:00
Justin Shreve 927941e2ca Merge pull request #10260 from justinshreve/token-api 
Payment Token API
 2016-03-04 04:34:41 -08:00
Mike Jolley e7e4808726 Correct status check and improved note 
#10461
 2016-03-03 17:04:20 +00:00
Mike Jolley fab1f224c6 When creating new order from draft, assume 'pending' for status transitions 
Fixes #10461
 2016-03-03 13:51:04 +00:00
Justin Shreve ccb2c90ef3 Update references for the tokenization UI script (hiding/showing inputs) to use the correct file. 2016-03-01 11:49:43 -08:00
Justin Shreve 49c45c6dc1 Make sure the is_default/default token ability works correctly. Also adds a new method for getting a users default token. Fixes up some docblocks. 2016-03-01 11:49:42 -08:00
Justin Shreve 0985292a79 Make sure the tokenization script is output even if the current user is logged out (we still show save payment method if user is creating account). 2016-03-01 11:49:42 -08:00
Justin Shreve e3d7e206d0 Create a function for getting correctly formatted credit card type labels (MasterCard, American Express, etc) 2016-03-01 11:49:42 -08:00
Justin Shreve 75f2e6b85c Fix up some comments and add uninstalling code. 2016-03-01 11:49:42 -08:00
Justin Shreve c0b74296ff * Remove WC_Payment_Gateway_Form in favor of having a Payment_Gateway_CC and Payment_Gateway_eCheck 
* Fix up some comments to match other comments in the WC code base
* Add some missing esc_* functions
* Add a gateway filter to get_customer_tokens + a test for it
 2016-03-01 11:49:42 -08:00
Justin Shreve e6a527547f Add the ability for gateways to override the "new payment method" label. 2016-03-01 11:49:42 -08:00
Justin Shreve eff4e297f9 First pass at showing saved payment methods on checkout 2016-03-01 11:49:40 -08:00
Justin Shreve 5d8967c7d7 Prepare a list of payment methods for output on the payment methods "my account" page. 2016-03-01 11:49:40 -08:00
Justin Shreve 0061b36f3b Make sure WP knows about the payment token meta table, and return null in payment tokens get if a token cannot be found. 2016-03-01 11:49:39 -08:00
Justin Shreve df260c228d Prevent notice from being displayed for user_id and remove static on echeck validate 2016-03-01 11:49:39 -08:00
Justin Shreve 7b57b4c4cc Validate length for expiry - 4 chars for year and 2 for month. 2016-03-01 11:49:39 -08:00
Justin Shreve 214f077a91 Implement the rest of the WC_Data methods for creating, updating, reading, etc. 2016-03-01 11:49:39 -08:00
Justin Shreve c87c99f847 Start implementing the WC_Data interface. Move update, create, save, etc to the actual token class, and have the controller return our tokens. This matches the shipping zone API closer. 2016-03-01 11:49:39 -08:00
Justin Shreve f66b9e3681 Move meta (when creating) to its own sub meta array. 2016-03-01 11:49:39 -08:00
Justin Shreve f66a8b6478 Rename customer_id to user_id to match how orders reference the user. 2016-03-01 11:49:39 -08:00
Justin Shreve bfa9437a43 Rename the meta name _payment_tokens to remove the wc_ prefix, since this meta is a part of WC orders already. 2016-03-01 11:49:38 -08:00
Justin Shreve 6112752836 Misc cleanup based on PR feedback: 
* Remove $token_id parameter from WC_Order's add_payment_token. get_id() can be used to access the ID
* Rename our list of token ids from meta to $token_ids as it makes more sense
* Cleaned up/fixed some of the comments in WC_Payment_Token
* Some code formatting fixes
 2016-03-01 11:49:38 -08:00
Justin Shreve 204922e2ae Add methods for managing payment tokens associated with an order. 2016-03-01 11:49:37 -08:00
Justin Shreve c5aec06a8a First pass at a payment token API 2016-03-01 11:49:37 -08:00
Mike Jolley fa2280f3f8 Add notice on fail 2016-02-29 12:33:09 +00:00