Commit Graph

587 Commits

Author SHA1 Message Date
Mike Jolley f6c71c23f4 Small fixes for 1.4 2012-02-01 21:49:08 +00:00
Mike Jolley bc240f9ebc Removed unused contructor 2012-02-01 16:33:03 +00:00
Mike Jolley 5332c77904 Remove sep notices until all extensions get updates 2012-02-01 12:32:44 +00:00
Julian Jöris daaa7e14c9 Merge remote-tracking branch 'upstream/master' 2012-02-01 12:09:39 +01:00
Mike Jolley ce87419d9d Inter. delivery 2012-02-01 10:58:46 +00:00
Mike Jolley ad799914b0 Paypal args hook Closes #554. 2012-01-31 23:20:34 +00:00
Mike Jolley 5cf4348eb5 Shipping method defaults 2012-01-31 19:25:50 +00:00
Mike Jolley 7f0e5e4301 International shipping method 2012-01-31 18:13:32 +00:00
Mike Jolley ed75351614 Removed unused option 2012-01-31 16:19:19 +00:00
Mike Jolley 4322d66561 Country order. Closes #549. 2012-01-31 16:19:11 +00:00
Julian Jöris 61cff26810 translation 2012-01-31 13:35:01 +01:00
Julian Jöris abfcd521bb clean 2012-01-31 12:09:40 +01:00
Julian Jöris aa91fe9eac clean 2012-01-31 12:07:43 +01:00
Julian Jöris 85ce14d321 clean 2012-01-31 12:06:44 +01:00
Julian Jöris 2151bd1b3d merge with master 2012-01-31 12:01:32 +01:00
Mike Jolley ce84132713 Minor fixes and comments 2012-01-30 19:24:52 +00:00
Mike Jolley 35fadb00fe More consistent template file naming, broken checkout into templates 2012-01-29 13:36:33 +00:00
Mike Jolley 451302cd0b Missed $order Closes #544. 2012-01-28 17:38:05 +00:00
Mike Jolley 0226faa96b incl. to checkout too 2012-01-28 15:34:21 +00:00
Mike Jolley f8ea5ed281 Regex trim zeros back 2012-01-28 15:20:49 +00:00
Mike Jolley e35fb0061d SKU to paypal 2012-01-27 22:24:56 +00:00
Mike Jolley de6b06b864 Add to cart validation, and a different redirect if theres an error 2012-01-27 18:31:30 +00:00
Mike Jolley 0836ce04db Better class names (final) 2012-01-27 16:38:39 +00:00
Mike Jolley 89a226a895 Store cart + shipping tax rows instead of a combination 2012-01-27 15:00:03 +00:00
Mike Jolley 6e9b1eb0c0 Don't update shipping meta if shipping to billing 2012-01-25 22:00:16 +00:00
Mike Jolley 56d98cb7c5 Send shipping name to paypal 2012-01-25 21:58:53 +00:00
Mike Jolley e8ef14ce7d Stock fix, and send shipping to paypal 2012-01-25 21:52:12 +00:00
Mike Jolley 60647b0838 Error list. Closes #528. 2012-01-25 20:37:21 +00:00
Mike Jolley 0afe34a222 Minor fixes 2012-01-24 16:56:37 +00:00
Mike Jolley 46651d60bc get_item_total for paypal 2012-01-22 15:54:23 +00:00
Mike Jolley 80cac8f9c8 Fixed up ajax, and made class filenames follow naming conventions 2012-01-22 15:49:41 +00:00
Geert De Deckere 7b943ecfb8 Merge branch 'master' of git://github.com/woothemes/woocommerce
Conflicts:
	woocommerce-ajax.php
2012-01-22 10:18:00 +01:00
Mike Jolley 2e60d61197 Merge pull request #520 from patrickgarman/master
Default function admin_options() with settings fields
2012-01-21 18:43:15 -08:00
Mike Jolley f9030e85d0 Order item row storage 2012-01-22 02:36:26 +00:00
Mike Jolley c14d2d5132 Renamed variables and functions for new item rows 2012-01-22 02:36:10 +00:00
Mike Jolley a25c098bf0 Removed rounding argument as it does nothing 2012-01-22 02:35:46 +00:00
Geert De Deckere 7706ecfe7b Starting class names with a capital. Closes #519. 2012-01-21 10:07:54 +01:00
Patrick Garman 92c3d2d611 one less function to write in gateway development 2012-01-21 03:10:59 +00:00
Mike Jolley 3ea6535910 Payment complete tweak Closes #513. 2012-01-21 01:15:39 +00:00
Patrick Garman 10f407b845 deprecated php 2012-01-19 17:49:48 +00:00
Mike Jolley 472a2b899f Merge pull request #512 from GeertDD/master
Removed unused globals from countries class
2012-01-18 04:48:04 -08:00
Mike Jolley 4929dd4c4b Added order to filter. #464. 2012-01-18 12:32:39 +00:00
Geert De Deckere 9a1986ae55 Removed unused globals in countries class 2012-01-18 11:30:00 +01:00
Mike Jolley 41f35f172d Fixes odd premature end of headers issue 2012-01-17 17:31:42 +00:00
Mike Jolley 53e194aece has_downloadable_item fix 2012-01-17 17:01:30 +00:00
Mike Jolley a4e987cde3 Don't calc shipping during ajax requests, except cart/checkout requests. Closes #509. 2012-01-17 15:59:05 +00:00
Mike Jolley 0db108ab69 Typecase array Closes #506. 2012-01-17 15:26:54 +00:00
Mike Jolley 2bbe8a1bca Coupon class fixes closes #507. 2012-01-17 15:20:04 +00:00
Mike Jolley be13c773e9 status 2012-01-17 11:58:20 +00:00
Geert De Deckere 69721c8276 Removed unneeded variable in countries class 2012-01-16 07:40:13 +01:00
Geert De Deckere f40745f34c Optimized get_base_country() and get_base_state() 2012-01-16 07:37:50 +01:00
Geert De Deckere 67fceb9660 Optimized white space related regexes 2012-01-15 07:31:47 +01:00
Geert De Deckere 8ad5cfe25b Made address format code easier to maintain 2012-01-15 07:22:43 +01:00
Mike Jolley 935734655b Added some text. 2012-01-14 20:51:18 +00:00
Patrick Garman 2b7f772f32 Adding local delivery/pickup methods to CORE 2012-01-14 19:36:26 +00:00
Mike Jolley ef721db613 Merge pull request #499 from GeertDD/master
Small simplification in tax class
2012-01-14 08:43:47 -08:00
Mike Jolley 8410619afd Shipping API per item taxaction 2012-01-14 16:42:04 +00:00
Geert De Deckere 50d968e0b2 Small simplification in tax class 2012-01-14 14:30:48 +01:00
Mike Jolley aa4b074ca3 Rounding and calc totals 2012-01-14 01:23:16 +00:00
Mike Jolley cd8b0fd492 Order calculations 2012-01-13 21:25:39 +00:00
Mike Jolley 88e18d6a3e When not showing taxes in cart, zero them for discounts 2012-01-13 14:41:07 +00:00
Mike Jolley cf17c91d8c Store currency and price inc tax per order. Closes #495. 2012-01-13 12:40:34 +00:00
Mike Jolley 7831db2f42 Minor changes. 2012-01-13 12:40:33 +00:00
Mike Jolley 8dbe617f21 Fix for locale counties. Closes #487. 2012-01-13 11:44:35 +00:00
Mike Jolley 05405b8eaf Stored totals so we don't recalculate on each page load. 2012-01-13 11:15:01 +00:00
Mike Jolley 23a3776f04 Tweaks to order/validation class to improve performance 2012-01-13 00:46:56 +00:00
Mike Jolley 228d79a864 Hide errors in case no object exists 2012-01-12 13:34:45 +00:00
Mike Jolley 2e62d34ac9 autop 2012-01-12 01:08:58 +00:00
Mike Jolley 567319bd51 Merge pull request #490 from patrickgarman/master
Adding COD to WooCommerce Core!
2012-01-11 16:57:41 -08:00
Mike Jolley a2d51aa201 Github sabotages files -.- 2012-01-12 00:54:45 +00:00
Mike Jolley 1dc5a3bc0b Revert 136456f805ccdf9b7b6bce027dc24da3c14d4281^..HEAD 2012-01-12 00:43:30 +00:00
Mike Jolley 136456f805 Remonde ob_start. Moved checkout processing to init hook. Fixed email bug. 2012-01-12 00:30:21 +00:00
Patrick Garman 8e499c9c95 Adding Cash on Delivery Gateway 2012-01-11 20:44:10 +00:00
Mike Jolley aa8f4596ba Improved get attribute function. 2012-01-10 17:14:40 +00:00
Mike Jolley 4fe59d979e Order fixes 2012-01-10 16:43:06 +00:00
Mike Jolley 2b09e9160c Show tab if weight/dimensions are set and being shown. Closes #467. 2012-01-10 15:36:14 +00:00
Mike Jolley bc91c1433b Goodbye &new. Closes #475. 2012-01-10 15:11:06 +00:00
Mike Jolley 4287a0628f Option to show children only in widget. Closes #472. 2012-01-10 14:55:08 +00:00
Mike Jolley dc4145dc57 Fix for previous commit 2012-01-09 18:08:56 +00:00
Mike Jolley 55222422c6 Option to hide tax on cart page. Closes #469. 2012-01-09 18:00:52 +00:00
Mike Jolley 86afeaf594 Show order backend fields. Closes #460. 2012-01-09 15:42:37 +00:00
Mike Jolley 9ec215d16e shipping is_available filters + paypal tweak 2012-01-09 13:14:47 +00:00
Mike Jolley 4b8ff30954 Only override posts_per_page if not set. Closes #408. 2012-01-07 18:31:49 +00:00
Mike Jolley 4c5ec53a57 Tweaked paypal gateway. Closes #465.
Not sure if it will resolve all issues, but should be an improvement.
Increased timeout, and cleaned post vars. Also output error if no IPN
response is received.
2012-01-07 17:58:06 +00:00
Mike Jolley 360ca6f0af Stock status change. Closes #462. 2012-01-06 17:28:33 +00:00
Mike Jolley aba310f321 WPML filters #244 2012-01-06 17:14:31 +00:00
Mike Jolley 2e90910389 woocommerce_checkout_no_payment_needed_redirect hook Closes #464. 2012-01-06 14:49:11 +00:00
Mike Jolley aa89763adb Default shipping. Closes #461. 2012-01-06 14:28:08 +00:00
Mike Jolley 6650434c3f Theming improvement 2012-01-06 14:02:34 +00:00
Mike Jolley dbe36b0dcb Free shipping coupons ignore min-amount 2012-01-06 11:36:19 +00:00
Mike Jolley cd87e4f688 related posts filter 2012-01-05 16:02:37 +00:00
Mike Jolley 42ef1ff9b0 Sale price empty check. Closes #433. 2012-01-05 16:00:23 +00:00
Mike Jolley 26afc5e454 Changed reg hooks 2012-01-05 15:26:41 +00:00
Mike Jolley 250d2f5cd6 Cleaned up some localisation's. Closes #438.
Let me know if there are any more.
2012-01-05 12:29:52 +00:00
Mike Jolley 24332672ad Payment method. Closes #449. 2012-01-05 12:11:34 +00:00
Mike Jolley f74e041a30 Renamed textdomain Closes #444. 2012-01-05 11:31:22 +00:00
Mike Jolley a48faca8cc Add line (ajax) 2012-01-04 23:11:07 +00:00
Mike Jolley a3f633e3a3 Fixes, subtotals, some backwards compat 2012-01-04 23:01:47 +00:00
Mike Jolley fb5bb626e8 Shipping tax calc + rows, fixed up write panel 2012-01-04 16:24:26 +00:00
Mike Jolley 28922bb4ef Shipping method tweaks/api to add multiple rates easily. 2012-01-03 19:07:32 +00:00
Mike Jolley ca0e9744ab Local tax rates - zips and zip ranges 2012-01-03 17:23:42 +00:00
Mike Jolley 86395f3c18 visibility options 2012-01-03 15:55:05 +00:00
Mike Jolley cd9aaa7f6f Local tax rate interface 2012-01-03 10:01:19 +00:00
Mike Jolley 8733821091 Email totals, interface for local tax rates 2012-01-02 17:45:26 +00:00
Mike Jolley d0dd26888b Inclusive tax calculations 2012-01-02 15:25:07 +00:00
Mike Jolley cc7e560a14 Bug fixes 2012-01-02 12:48:56 +00:00
Mike Jolley ec7135ebb4 Taxes rounding + shipping, started email totals 2012-01-02 00:49:00 +00:00
Mike Jolley bd4eaa9eb1 Tax rows and add order line item ajax 2011-12-31 19:03:41 +00:00
Mike Jolley 115e3bee18 Checkout and cart totals 2011-12-30 21:11:18 +00:00
Mike Jolley c4231910b5 Order totals + shipping tax (draft) 2011-12-30 19:36:44 +00:00
Mike Jolley 1de85e5d19 More taxes + totals work. Line item tweaks.
Next step; shipping.
2011-12-30 14:00:41 +00:00
Mike Jolley a28d758a90 Calculations for tax rates 2011-12-29 01:18:59 +00:00
Mike Jolley 90a257b4fa Tax rows and compound taxes on cart page 2011-12-28 23:59:33 +00:00
Mike Jolley d20fbb1d58 Don't need country in address if = to base 2011-12-28 12:38:49 +00:00
Mike Jolley 45d78748a1 Few more missed keys 2011-12-24 17:09:43 +00:00
Mike Jolley fb57cc7e9d More key renames 2011-12-24 17:05:51 +00:00
Mike Jolley 364c0bd54c Renamed all product data meta keys
This is so they are hidden (_). Should have done this long ago. Few
extensions will need updating when 1.4 goes out to reflect these
changes, mainly importers.
2011-12-24 16:57:36 +00:00
Mike Jolley 129cf884fc Order # in backorder notification. 2011-12-23 19:58:41 +00:00
lucasstark 4b6f8b067d Added filter to coupon loading 2011-12-23 14:20:27 -05:00
Mike Jolley 11e81cea70 get_cart_tax filter 2011-12-23 18:15:46 +00:00
Mike Jolley 698ef5d59e Fixes when tax is disabled. 2011-12-23 18:07:44 +00:00
Mike Jolley 50774151a4 Round order total. Closes #342. 2011-12-23 16:30:46 +00:00
Mike Jolley 3a63feca07 Merge pull request #410 from spencerfinnell/master
Allow email subjects to be filtered.
2011-12-22 12:33:14 -08:00
Spencer Finnell 092fe416ba Allow email subjects to be filtered. 2011-12-22 14:59:59 -05:00
Mike Jolley e016a1253f Query tweaks. Using 3.3 function is_main_query 2011-12-22 19:55:21 +00:00
Mike Jolley cd7665f936 Order key hook. Closes #405. 2011-12-21 23:54:11 +00:00
Mike Jolley 74bb271e96 Filter checkout fields..
.. you can pretty much turn off all fields now - although, you'll need
to turn off tax + shipping calcs too since they rely on addresses to
function.
2011-12-21 21:56:01 +00:00
Randy Hoyt 63e5693c9d Hook to enable modifying tax rate on a particular order with a filter; postal code added as a parameter for those filters 2011-12-21 14:24:34 -06:00
Mike Jolley 3fe3fffe90 Address. Closes #301. Closes #395.
Improved checkout processing.
Made edit-address use the locale specific address fields.
2011-12-21 16:03:45 +00:00
Mike Jolley 18a80b5564 Send fix. Closes #396. 2011-12-21 11:29:38 +00:00
Julian Jöris f0ea7f8c8a fix 2011-12-20 16:47:18 +01:00
Julian Jöris 66334486ed gateway payment_fields fix 2011-12-20 16:44:46 +01:00
Julian Jöris c07d56f5d0 Merge remote-tracking branch 'upstream/master' 2011-12-20 11:00:46 +01:00
Mike Jolley 9c80356589 Download links. Closes #375. Closes #349. 2011-12-19 17:50:41 +00:00
Mike Jolley c4625ad91e Coupon on checkout. Closes #379. 2011-12-19 17:11:19 +00:00
Julian Jöris b36b21390b Merge remote-tracking branch 'upstream/master' 2011-12-19 15:53:50 +01:00
Mike Jolley 665d8bf512 Shipping method ordering. Closes #347. 2011-12-19 14:05:32 +00:00
Mike Jolley 18cc9a9442 Admin formatted address 2011-12-18 13:41:42 +00:00
Mike Jolley 17a59bf3ec Formatted address function + added to my account 2011-12-18 01:29:10 +00:00
Brent Shepherd 74fc1d8caa Merge branch 'master' of git://github.com/woothemes/woocommerce 2011-12-17 15:04:31 +10:00
Mike Jolley f04256320d Locale stuff. Added locales for address fields for countries.
next step is to make the address formats work.
2011-12-16 21:19:56 +00:00
Mike Jolley 03891e7f56 Dynamic checkout fields based on locale 2011-12-16 15:11:41 +00:00
Mike Jolley 073d3cb2f0 Putting localisation stuff in countries class 2011-12-15 23:24:02 +00:00
Mike Jolley df24e9e743 Locale settings for checkout
Work for base country, now it needs to be dynamic when changing
countries
2011-12-15 20:34:14 +00:00
Mike Jolley fe3242558a Working on locales, also added 'chosen' as an option for the checkout 2011-12-15 20:34:14 +00:00
Mike Jolley 7163d1dd38 Download URL fix with HTTPS 2011-12-15 11:21:06 +00:00
Brent Shepherd c312c1ba95 Merge branch 'master' of git://github.com/woothemes/woocommerce 2011-12-15 21:16:17 +10:00
Brent Shepherd 687e1c9acd Only updating order shipping meta if shipping details are set. 2011-12-15 20:15:12 +10:00
Mike Jolley 7ce329b2fd Merge pull request #374 from lucasstark/patch-5
Added woocommerce_after_cart_item_quantity_update action to the set quan...
2011-12-14 17:17:24 -08:00
Mike Jolley feb9afd30b Started work on locale options for ticket #316.
Plan is to combine locale options with the checkout array so fields can
be overridden.
2011-12-15 01:14:47 +00:00
lucasstark 7612a3803f Added woocommerce_after_cart_item_quantity_update action to the set quantity method. Also modified the add_to_cart method to call the set_quantity function so the same hook is called. 2011-12-14 19:06:01 -05:00
Mike Jolley 4e85d2a8c5 Removed unused counties (GB) 2011-12-14 23:57:42 +00:00
Mike Jolley 07d7cfd4a3 Ensure base shipping is set. Closes #366. 2011-12-14 23:50:32 +00:00
lucasstark e39de48c84 Added woocommerce_before_calculate_totals action to the calculate_totals() function. 2011-12-14 14:02:41 -05:00
Mike Jolley 48f11d8c0d Filters for customer email attachments 2011-12-12 17:59:39 +00:00
Mike Jolley 40b61efa3d Check order is published. Closes #346. 2011-12-12 17:39:31 +00:00
Mike Jolley 94cfb82379 Added context. Closes #348. 2011-12-12 17:13:06 +00:00
Julian Jöris 8af8e6af41 Merge remote-tracking branch 'upstream/master' 2011-12-12 17:46:07 +01:00
Mike Jolley 046f770d08 PayPal totals bug 2011-12-12 11:36:04 +00:00
Mike Jolley 35d1d56329 Made product global, setup automatically, and removed the need to call the class directly in the loop
Themes need checking for compat, but the change makes it easier to use
2011-12-11 14:40:25 +00:00
Mike Jolley 6dff689cb9 Fixes 2011-12-10 18:40:51 +00:00
Mike Jolley 733b51401c Moved email functions to classes, and made posts only save once (faster) 2011-12-10 17:28:32 +00:00
Mike Jolley dae7cf35a2 Optimisations + order details template 2011-12-09 21:47:12 +00:00
Mike Jolley f778c4f3ec Started new structure, moved short codes into template files, moved main class into main file 2011-12-09 17:01:56 +00:00
Mike Jolley 65da4279ae Show all shipping classes 2011-12-09 16:45:03 +00:00
Mike Jolley 1790bd09d5 Fix for manual order addition and other tweaks. Closes #345. 2011-12-08 19:45:24 +00:00
Mike Jolley 2d2c5e74c3 More tweaks 2011-12-08 13:13:59 +00:00
Mike Jolley 0c53f02452 Have to load payment methods so IPN hooks work etc 2011-12-08 12:57:49 +00:00
Mike Jolley f74dc9e06f Minor optimisations 2011-12-08 12:50:50 +00:00
Julian Jöris 11511a48b8 Merge remote-tracking branch 'upstream/master' 2011-12-08 10:08:46 +01:00
Mike Jolley 0d8039c4b3 Sort countries 2011-12-07 19:45:29 +00:00
Mike Jolley d3e122641d add_inline_js helper for adding javascript to the footer 2011-12-07 17:36:58 +00:00
Mike Jolley c607cb3488 Made resume order code even safer 2011-12-07 17:25:08 +00:00
Mike Jolley 2d31b37b36 usate limit fix 2011-12-07 16:22:57 +00:00
Mike Jolley 5e918e6258 PayPal target 2011-12-07 11:40:56 +00:00
Mike Jolley 81bfeec086 Fix 2011-12-07 11:33:34 +00:00
Mike Jolley 10d2431dc6 Missing localisation's. Closes #335. 2011-12-06 17:04:50 +00:00
Mike Jolley 2979740357 Removed wc_table_rate textdomain. Closes #334. 2011-12-06 16:47:44 +00:00
Mike Jolley 5f5eb20335 Sort gateways and set a default 2011-12-06 16:45:08 +00:00
Mike Jolley 49d24b09aa Fix for free shipping min amount 2011-12-06 14:30:25 +00:00
Mike Jolley 137396fd9e Tax based on shipping address, and fixed outside_base function 2011-12-06 10:49:34 +00:00
Mike Jolley bce591b75f Fix for shipping/payment method to include titles 2011-12-05 18:16:13 +00:00
Mike Jolley 80480818bd % discount fix 2011-12-05 15:41:13 +00:00
Mike Jolley ad6ccc02e8 Get nice gateway name 2011-12-05 12:39:05 +00:00
Mike Jolley 38153003f1 Flat rates shipping classes calcs 2011-12-03 19:06:32 +00:00
Mike Jolley e9551861a7 Tweaked scripts + flat rate 2011-12-03 18:37:20 +00:00
Mike Jolley a4dd5fe344 Reduced settings API queries 2011-12-03 13:44:28 +00:00
Mike Jolley 16853cb6f6 Per order shipping with classes 2011-12-02 20:48:07 +00:00
Mike Jolley 17ccf1f92d Added shipping class taxonomy and prepared flat rates admin to define rates per class 2011-12-02 18:54:52 +00:00
Mike Jolley c8de45d773 Email table borders 2011-12-02 14:04:26 +00:00
Mike Jolley 326bdd400f Trim zeros off prices (optional) Closes #297. 2011-12-01 11:34:26 +00:00
Julian Jöris 67b8243bc9 Merge remote-tracking branch 'upstream/master' 2011-12-01 11:58:07 +01:00
Mike Jolley acfc5f875e PayPal gateway 2011-11-30 20:43:13 +00:00
Mike Jolley 2efd580f50 IIS fix 2011-11-30 13:34:27 +00:00
Mike Jolley 6dc4d2add8 Final tax logic fixes
Storing base cost/discounted cost instead of row_discount to keep calks
simple and maintain backwards compatibility.
2011-11-30 00:30:39 +00:00
Julian Jöris 07c7c0b59f Merge remote-tracking branch 'upstream/master' 2011-11-29 10:16:10 +01:00
Mike Jolley 8f730461d9 get_item_cost helper 2011-11-29 00:52:57 +00:00
Mike Jolley 33706cc1fb Find tax rate fix 2011-11-29 00:20:51 +00:00
Mike Jolley 53f2a07119 Totals cleanup 2011-11-28 23:33:08 +00:00
Mike Jolley e02e712d1e PayPal tweak 2011-11-28 17:03:53 +00:00