Commit Graph

366 Commits

Author SHA1 Message Date
kathy 3acd6f21de Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	templates/checkout/form-pay.php
	templates/checkout/review-order.php
2012-11-07 19:04:00 -06:00
Mike Jolley 9971da5f86 Fix for #1707. 2012-11-07 21:23:45 +00:00
kathy 6eb5215da0 fix for #1707 2012-11-07 14:53:23 -06:00
Coen Jacobs 80fc5fc086 [3.2.3] Templates XSS #1575 2012-10-16 17:35:16 +02:00
Mike Jolley 8c3ad31c07 Localisation spacing. 2012-10-16 10:45:33 +01:00
Coen Jacobs 943091d2ca [3.1.4] Prevent direct access to files #1575 2012-10-15 12:57:58 +02:00
Mike Jolley 34f230a0d0 Tax display tweaks. 2012-10-12 12:57:08 +01:00
Brent Shepherd 137b01c74c Show taxes if there are formatted taxes
The cart only checks if an order has tax when deciding to
display taxes. Subscriptions 1.2+ stores recurring taxes
separately, so when an order has a free trial period
and no sign-up fee, order tax will be 0 but the
recurring taxes should still be displayed.
2012-09-24 12:55:57 +10:00
Mike Jolley 584c65eeb0 Session fixes 2012-09-12 12:48:30 +01:00
Mike Jolley fdd34e5c0e session -> transient WIP 2012-09-07 18:26:13 +01:00
Mike Jolley 3267de6daa Hooks for #1376. Closes #1376. 2012-08-21 13:06:54 +01:00
Adam Pickering (Mint Themes c42e0c7fcd Fixes issue with coupon field box styling
The coupon box doesn't have the correct input type so theme designers can't apply there custom style to the box field.

It doesn't have input type="text" so this commit fixes the issue.

See screen shot of issue: http://o7.no/NfKtDe
2012-08-20 17:40:05 -03:00
Mike Jolley ef7ec98f2e templates 2012-08-14 23:43:54 +01:00
Mike Jolley 9acb170520 Option to register using the email address as the username instead of entering a username. Closes #1027. 2012-08-10 12:15:32 +01:00
Mike Jolley 1b0a206bd9 Handling for non-JS checkout 2012-07-16 20:21:44 +01:00
Mike Jolley 5cd01f58a0 get_order_item_totals() total_rows have fixed indexes for easier manipulation. Closes #1059. 2012-07-11 19:32:00 +01:00
Mike Jolley 58f84bb2c1 incl. Closes #1184. 2012-06-29 20:45:09 +01:00
Mike Jolley 3cc8f41b90 get_icon get_title get_description for #1201 2012-06-29 19:44:33 +01:00
Coen Jacobs 863918f7f4 Revert "Moved # character in translatable order strings. Closes #1161"
This reverts commit f6c83fe6aa.
2012-06-20 19:18:16 +02:00
Coen Jacobs f6c83fe6aa Moved # character in translatable order strings. Closes #1161 2012-06-20 19:14:33 +02:00
Mike Jolley c9ddba1e35 Hooks for stripe 2012-06-19 19:09:51 +01:00
Manos Psychogyiopoulos a64ac21fb1 Added filtered class attributes to tr table elements in cart, review-order and order-details templates.
Makes it possible to style the appearance of these tables depending on
the item's properties. E.g. smaller fonts or no borders for bundled
items.
2012-06-09 18:31:17 +03:00
Manos Psychogyiopoulos b57183f337 Add filters to get_product_subtotal in review-order & cart templates. 2012-06-09 17:39:59 +03:00
James Koster d810998980 handy class 2012-06-06 16:48:35 +01:00
Brent Shepherd 808a482fed Centralising use of woocommerce_price() for cart taxes with new WC_Cart::get_formatted_taxes() function and adding new woocommerce_cart_formatted_taxes filter. 2012-05-23 15:24:04 +10:00
Mike Jolley 26a8af2440 radio shipping methods 2012-05-13 21:02:07 +01:00
Mike Jolley 90ad5da65b Merge pull request #990 from thenbrent/new-order
New WC_Order Class Formatting Filters & Function
2012-05-01 17:07:25 -07:00
Mike Jolley 7840c79251 style rework. Shareyourcart (needs more work) 2012-04-28 18:28:18 +01:00
Brent Shepherd 6df9fff54d Adding "Replacing instances of "woocommerce_price($order->order_total)" with new WC_Order::get_formatted_order_total() function. 2012-04-27 12:22:19 +10:00
Mike Jolley 68586f3005 Collect shipping address even when not required 2012-04-21 19:30:37 +01:00
Brent Shepherd 0a04b9044c Fixing bug causing "Billing & Shipping" to display on checkout form even when the cart contents did not need shipping. 2012-04-16 10:45:35 +10:00
Mike Jolley a36d0b74e7 missing semi-colon. Closes #923. 2012-04-13 12:44:10 +01:00
Mike Jolley b9bec0be75 show_shipping. Closes #901. 2012-04-11 13:08:04 +01:00
Mike Jolley a9a5f0ceca extra actions for checkout. @8cc310c14ab55131a79f4340a37ef392283fc3ab 2012-04-10 18:21:33 +01:00
Mike Jolley f99353a861 Merge pull request #878 from foxrunsoftware/master
Adds a Few Shipping Related Action Hooks
2012-03-26 08:17:22 -07:00
Mike Jolley 659d3ee3b4 get order number function complete with filter. Tweak the display of order ID's if you use custom numbering.
Had to tweak some localisation strings to dump the '#' symbols.
2012-03-26 11:26:50 +01:00
Justin Stern 37efd18ffc Adds a Number of Shipping Related Action Calls
Adds a number of shipping related action calls to provide more hooks for
customizations
2012-03-24 13:00:59 -04:00
Mike Jolley 8914d1856a n/a 2012-03-12 16:14:00 +00:00
Mike Jolley ec83b4d24f Merge pull request #790 from GeertDD/display_no_tax_row
Force the tax row to show up even if no taxes are applicable
2012-03-12 09:00:52 -07:00
Geert De Deckere 3d52b629c3 Added an option to force the tax row to be visible even if no taxes are applicable. 2012-03-12 13:50:38 +01:00
Geert De Deckere 3e13bd5ebf Instead of hiding the tax row if not applicable, show it explicitely as not applicable. 2012-03-12 12:26:48 +01:00
Geert De Deckere 0401e79ed4 Added option to globally enable/disable the use of coupons for clients 2012-03-12 10:25:06 +01:00
Mike Jolley 9a282ce3ab Fixes 2012-03-05 13:25:02 +00:00
Geert De Deckere 1cd6ab9bf1 Fixed label for "ship to billing" checkbox 2012-03-01 14:12:56 +01:00
Mike Jolley 94028e3528 total rows + readme 2012-02-16 16:54:22 +00:00
Geert De Deckere 9a8581b3a9 Addes same classes for table header cells 2012-02-16 12:29:15 +01:00
Geert De Deckere 8bd4947006 Added classes to the table cells for order review 2012-02-16 12:25:02 +01:00
Geert De Deckere 1984cf5b85 Renamed hooks 2012-02-15 16:39:22 +01:00
Geert De Deckere 0c8ad83c28 Added action 'woocommerce_cart_contents_review' to the order review page 2012-02-15 13:26:35 +01:00
Mike Jolley 29c29b6198 Strip tags 2012-02-14 14:45:43 +00:00
Geert De Deckere b0f4660801 Fixed HTML escaping of the method label 2012-02-13 10:16:22 +01:00
Mike Jolley f41242a1c6 Merge pull request #618 from GeertDD/shipping_select
Don't show a select list if there's only a single shipping method to choose from.
2012-02-12 03:41:34 -08:00
Mike Jolley 9cf264504b Checkout error page 2012-02-12 11:36:33 +00:00
Geert De Deckere 08db90e9a0 Added shipping_method id which is used in the javascript file. 2012-02-11 15:17:03 +01:00
Geert De Deckere 0f59bd797d Don't show a select list if there's only a single shipping method to choose from. Closes issue #605. 2012-02-11 14:46:54 +01:00
Mike Jolley 44794833f6 Goodbye to free Closes #602. 2012-02-09 09:45:11 +00:00
Mike Jolley 3b5272e72e Improved template loader 2012-02-03 16:42:21 +00:00
Mike Jolley 35fadb00fe More consistent template file naming, broken checkout into templates 2012-01-29 13:36:33 +00:00
Mike Jolley 0226faa96b incl. to checkout too 2012-01-28 15:34:21 +00:00
Mike Jolley 89a226a895 Store cart + shipping tax rows instead of a combination 2012-01-27 15:00:03 +00:00
Mike Jolley 1f89670da2 Date fixes 2012-01-25 15:23:32 +00:00
Mike Jolley ad30381ba3 Changed functions in order total rows - renamed to make more sense 2012-01-22 02:35:26 +00:00
Mike Jolley 23a3776f04 Tweaks to order/validation class to improve performance 2012-01-13 00:46:56 +00: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
Mike Jolley aba310f321 WPML filters #244 2012-01-06 17:14:31 +00:00
Mike Jolley 40010ad60a Fix login and logout urls 2012-01-05 14:55:09 +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 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 115e3bee18 Checkout and cart totals 2011-12-30 21:11:18 +00:00
Mike Jolley b133d41849 few hooks 2011-12-22 20:30:12 +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
Mike Jolley 57494f93d4 Put button back 2011-12-21 11:21:25 +00:00
Julian Jöris c07d56f5d0 Merge remote-tracking branch 'upstream/master' 2011-12-20 11:00:46 +01: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
Julian Jöris 8af8e6af41 Merge remote-tracking branch 'upstream/master' 2011-12-12 17:46:07 +01:00
Mike Jolley 0dc662a16e Templates 2011-12-12 12:28:07 +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 2d2c5e74c3 More tweaks 2011-12-08 13:13:59 +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 5f5eb20335 Sort gateways and set a default 2011-12-06 16:45:08 +00:00
Julian Jöris 07c7c0b59f Merge remote-tracking branch 'upstream/master' 2011-11-29 10:16:10 +01:00
Mike Jolley 3bf4f98b47 Shipping inc tax label 2011-11-29 00:30:49 +00:00
Julian Jöris 6a637bfbf5 Merge remote-tracking branch 'upstream/master' 2011-11-28 08:19:11 +01:00
Mike Jolley f7b4bebacc Final tax rounding issues 2011-11-26 16:15:25 +00:00
Julian Jöris ebd83bdd10 Merge remote-tracking branch 'upstream/master' 2011-11-22 16:42:27 +01:00
Mike Jolley 61136d0a9e More cart and coupon logic fixes. + renamed cart totals 2011-11-22 13:18:33 +00:00
Julian Jöris 7d7fa33d70 Merge remote-tracking branch 'upstream/master' 2011-11-22 14:06:48 +01:00
Mike Jolley 53ccc12361 Country outside base/different rate tax tweaks 2011-11-21 16:26:06 +00:00
Julian Jöris fb5df55da5 merge 2011-11-21 11:38:14 +01:00
Mike Jolley fe5651fff5 Tax rewrite to deal with coupons before tax calculations
Needs a lot of testing - esp to detect rounding errors.
2011-11-19 20:59:16 +00:00
Mike Jolley 3276263736 After checkout validation hook + place order filter 2011-11-18 17:39:56 +00:00
Julian Jöris b818f95cdd hooks needed for the german Version 2011-11-18 17:26:27 +01:00
Mike Jolley b23338c2b0 Prevent checkout being submitted twice 2011-11-16 09:38:04 +00:00
Mike Jolley 101fcd9b3f Order meta saves + displays 2011-11-06 15:45:22 +00:00
Mike Jolley 869f413e9b New cart code adapted from Lucas Starks pull request.
Cart items are indexed by an md5 hash rather than numeric keys so we
can add custom data to cart items.

Plugins can hook in and add meta data, load it, and display it. The
adjust_price() function lets you adjust a products price too since its
loaded and stored in the cart on page load.

All works like a dream, all thats left is to show the values on the
cart page, and store them in the order item meta. Order item meta does
need a slight change though, to allow data with the same keys. Working
on that next.
2011-11-06 13:45:18 +00:00
Mike Jolley 297ffd7af0 Paypal fix, and Signup/login can be turned off for checkout. Closes #125. 2011-11-04 17:48:04 +00:00
Mike Jolley b2ccf3b700 Conditional tax/vat 2011-10-31 10:54:49 +00:00
Mike Jolley a66c84497c Better checks for shipping 2011-10-26 10:40:26 +01:00
Mike Jolley 01ffcd7518 Checkout mods 2011-10-05 21:08:37 +01:00
Mike Jolley f46bc5ed9b esc_html/esc_attribute in review-order.php 2011-09-30 09:48:43 +01:00
Mike Jolley fea14650a2 Filters renamed 2011-09-21 17:58:05 +01:00
Mike Jolley bbb02b616b Few hook changes 2011-09-21 16:13:53 +01:00
Mark Jaquith 7674bbe60e esc_url() run 2011-09-21 14:51:46 +08:00
Mark Jaquith f784986a0d First esc_attr() pass 2011-09-19 14:02:55 +08:00
Mike Jolley c18f533b39 Overhauled classes and removed singletons 2011-09-06 12:11:22 +01:00
Mike Jolley 63ec2b001f New shipping system to delete with multiple rates per gateway 2011-09-02 15:42:17 +01:00
Mike Jolley 1832e8bd8d New email system, better order review handling 2011-08-16 15:06:08 +01:00
Mike Jolley d7b8cf624e Settings re-work 2011-08-13 17:07:10 +01:00
Mike Jolley 0425a68eca WooCommerce conversion and update 2011-08-10 18:11:11 +01:00
Mike Jolley 8e8613b116 First Commit - from Jigoshop Source 2011-08-09 16:16:18 +01:00