Commit Graph

1268 Commits

Author SHA1 Message Date
Mike Jolley 1076854608 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/class-wc-shipping.php
#	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
#	includes/shipping/flat-rate/includes/class-wc-eval-math.php
#	includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
Kathy Darling 67c06f313e add filter for reset variations link html 2016-01-07 09:43:34 -05:00
Mike Jolley 1093d2f64c Check passed in variables are set
#9983
2016-01-06 11:52:18 +00:00
Mike Jolley 97d47fb576 Move zones to main settings 2016-01-05 11:23:15 +00:00
Mike Jolley 89ede21ff2 Terms before button
@jameskoster any problem using that float?

Closes #9880
2015-12-18 22:11:45 +00:00
Mike Jolley 90d472a0fe set $method 2015-12-17 10:15:58 +00:00
roykho 0825b5001e Fix undefined variable when there is only one available method 2015-12-16 18:23:56 -08:00
Andrew Minion b296962ca8 update grammar 2015-12-16 13:14:18 -06:00
Mike Jolley 8aec02f625 Remove shipping select box option, tidy up logic and add filters from #9797
closes #9797
2015-12-16 13:00:16 +00:00
Mike Jolley 0ebba8b0be flip desc and price 2015-12-04 13:34:38 +00:00
Mike Jolley b7d8091a44 pass full variation object into script instead of parts 2015-12-04 13:31:36 +00:00
Mike Jolley 2c023a2847 Pass the wp.template to the script and append so its added to the page once when needed 2015-12-04 13:26:44 +00:00
Mike Jolley 948a8f5c47 Filters for loop add to cart
Closes #9753
2015-12-04 11:50:37 +00:00
Mike Jolley dcef386d6c form pay hooks before and after button Closes #9746 2015-12-03 12:06:14 +00:00
Mike Jolley 86c9d7c4b8 Changed terms alignment and added *
Fixes #9650
2015-12-03 09:49:36 +00:00
Mike Jolley b5a2c2a9d5 Unify all order email tables to use a single template
Closes #9587

@claudiosmweb @jameskoster
2015-11-30 15:16:23 +00:00
Mike Jolley ec01c3d76f Made "my orders" columns fully customisable for filters.
woocommerce_my_account_my_orders_columns filter used to define columns
and woocommerce_my_account_my_orders_column_ID to add content to said
column.

Removes the need for and thus Closes #9634 and closes #9633

@claudiosmweb
2015-11-27 12:54:28 +00:00
Mike Jolley 4b47f98132 Merge pull request #9682 from iamtakashi/twentysixteen
[2.4] Edit for Twnety Sixteen
2015-11-23 18:50:45 +00:00
Mike Jolley 31a7c7df99 Show meta data on form-pay
Fixes #9674
2015-11-23 18:22:31 +00:00
Takashi Irie d88ba80f84 Edits for Twnety Sixteen 2015-11-23 11:55:50 +00:00
mitogh f902b1fc8e Break large lines into more manable and indent lines 2015-11-20 20:46:55 -06:00
mitogh d4c3710994 Separate HTML from PHP for easier update of the button template 2015-11-20 20:45:19 -06:00
roykho 9078e30ea4 Fix acronym zip to be all capitals fixes #9641 2015-11-18 15:32:23 -08:00
Mike Jolley e94c2b86ca Remove shipping/tax estimation notice and show in context when needed.
Avoids needing complex logic for something which could easily be typed
onto the page by store owner if needed.

Also adjusts line height and padding in cart collaterals

Closes #9578
2015-11-16 15:59:47 +00:00
Nicola Mustone ef3410ea2e format text for better understanding 2015-11-16 12:39:44 +01:00
mitogh f8f70f294a Update strict comparission and update to Yoda condition
In order to follow one of the best practices from the Wordpress
handbook:

- https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
2015-11-14 20:35:29 -06:00
mitogh 4d86d8a6ad Add strict comparission on another templates 2015-11-14 20:35:00 -06:00
mitogh d3804dc16c Forece strict comparisons on single products template 2015-11-14 20:31:23 -06:00
Claudio Sanches 1f24a22de6 Escape price.php template 2015-11-09 00:57:36 -02:00
Mike Jolley 1b38f380af Merge remote-tracking branch 'origin/master'
Conflicts:
	includes/emails/class-wc-email.php
2015-11-03 16:09:01 +00:00
Claudio Sanches a0d266640a Looks better with single quotes, closes #9493 2015-11-03 13:58:05 -02:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Mike Jolley 48b93b937f Added admin order/payment failed notification
Closes #8617
2015-11-02 14:45:24 +00:00
James Koster 1d0f52f6db revert order pay responsive table. #9015
Would require a conditional colspan for handheld. Not worth the
overhead for this small table which should perform adequately already.
2015-11-02 13:59:07 +00:00
James Koster 2b39c78ce8 No need for customer details table to be responsive. #9015
Like several other tables, it’s small enough to degrade gracefully on
handheld devices
2015-11-02 13:59:07 +00:00
James Koster 2b05a493f6 Makes the order payment table responsive. #9015 2015-11-02 13:59:07 +00:00
James Koster c114489d5b Responsive cart and cart totals tables. #9015 2015-11-02 13:59:07 +00:00
Mike Jolley 798cf9a50b Merge pull request #9485 from helgatheviking/email-ids-on-hooks
pass email object to email templates and template hooks
2015-11-02 13:02:04 +00:00
Mike Jolley 7fdb93329c Merge branch 'revised-single-variation-cart-template'
Conflicts:
	includes/admin/views/html-admin-page-status-report.php
2015-11-02 11:26:49 +00:00
Mike Jolley c29517e87e Merge branch 'pr/9471' 2015-11-02 11:24:01 +00:00
Mike Jolley aec0e0e327 supports() method which mirrors gateways
Closes #9471
2015-11-02 11:23:50 +00:00
Mike Jolley 3ca5022649 Added template files for the customer details list in emails. emails/email-customer-details.php
Closes #9253
2015-11-02 10:41:05 +00:00
Kathy Darling f893d73af6 pass email object to email templates and template hooks 2015-10-31 23:04:59 -05:00
Kathy Darling 856d192bff Use generic `ajax_add_to_cart` class for adding items in the loop to the cart via ajax. 2015-10-30 12:54:49 -05:00
Mike Jolley 77054e11fa Improve appearance when only 1 gateway is active.
Closes #8982
2015-10-30 15:23:16 +00:00
Claudio Sanches 0ff88deb98 Improved wc_coupons_enabled() name and description 2015-10-29 17:23:10 -02:00
Mike Jolley d1d9ff1b59 Adjust how the 'clear' link appears 2015-10-29 16:51:05 +00:00
Claudio Sanches f64ea948f1 Replaced WC()->cart->ship_to_billing_address_only() to wc_ship_to_billing_address_only() 2015-10-28 16:03:24 -02:00
Claudio Sanches e61b162355 Escaped urls in templates/cart/mini-cart.php when mini cart is empty 2015-10-28 15:58:40 -02:00