Commit Graph

306 Commits

Author SHA1 Message Date
Mike Jolley 75c264837f Justins feedback/code tidy 2016-02-10 13:21:16 +00:00
Mike Jolley 114cbdd450 Autoload tweaks 2016-02-09 23:26:22 +00:00
Mike Jolley 78296adf67 Missin list element 2016-02-05 15:45:32 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Mike Jolley 8c85183d6e [2.5] Remove case check from tax rate country REGEX 2016-01-27 12:10:36 +00:00
Claudio Sanches e87007d5cd [2.5] Fixed tax row autocomplete htmlentity, closes #10149 2016-01-23 14:32:09 -02:00
Claudio Sanches 6277d96770 Stop direct access 2016-01-19 15:57:03 -02:00
Mike Jolley b788418283 Load shipping methods during save
Fixes #10072
2016-01-14 13:24:02 +00:00
Mike Jolley d821b87f8a Move shipping classes to custom UI in shipping section 2016-01-13 16:52:28 +00:00
Mike Jolley 8064b35350 Add methods from zones screen 2016-01-13 15:04:10 +00:00
Mike Jolley 31be09073f Show zones if no matching shipping method is found 2016-01-13 12:41:54 +00:00
Mike Jolley c8025705c1 Text changes 2016-01-13 12:38:31 +00:00
Mike Jolley 6a8819fc23 Text changes 2016-01-13 12:31:10 +00:00
Mike Jolley 68e30f0f38 Zones page text 2016-01-13 12:12:58 +00:00
Claudio Sanches 636e2389aa Changed … to … 2016-01-12 14:03:01 -02:00
Mike Jolley 70a9eb3807 Fix pagination + sorting on tax screen
@claudiosmweb
2016-01-12 12:01:10 +00:00
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
Mike Jolley accc62d5ef Breadcrumb tweak 2016-01-08 12:10:40 +00:00
Mike Jolley cef3ec7e37 Indicate disabled methods 2016-01-08 11:57:49 +00:00
Mike Jolley ad11042afd [2.4] Don't unforce SSL on secure blogs
@claudiosmweb can you check this and cherry pick if good to go?

Fixes #10029
2016-01-08 11:27:18 +00:00
Fredrik Forsmo 72f062b452 Improve docblock comments in WC_Settings_* classes
* Added comments to properties that don’t have any.
2016-01-05 16:22:18 +01:00
Mike Jolley 97d47fb576 Move zones to main settings 2016-01-05 11:23:15 +00:00
Mike Jolley 62ca37f651 Merge branch 'master' into shipping-zones
# Conflicts:
#	includes/admin/class-wc-admin-assets.php
#	includes/class-wc-install.php
2016-01-04 14:35:45 +00:00
Andrew Benbow d4f4e7625c Correct a to an
SSL is pronounced "es es el" and so requires an not a, see Use 6 here http://www.englishpage.com/articles/a-vs-an.htm
2015-12-29 20:35:13 +00: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
Fulvio Notarstefano d7d70298c5 #9857 change get_class to 2015-12-16 14:25:17 +08:00
Mike Jolley 9818796d3e Removing selection priority
This option was added so you could sort methods in a custom order, but
choose a different default.

Doing this per zone would add extra complexity, and this has also
proven problematic when a method registers multiple rates.

This commit removes usage of the setting. We should use the display
order and choose the top method by default. It think this balances ease
of use with control.
2015-12-15 15:49:35 +00:00
Mike Jolley 63f8eebd6a Started on refactoring settings for instances 2015-12-11 16:41:38 +00:00
Claudio Sanches 987b93c87e Changed (Untitled) to (no title) #9806 2015-12-09 16:28:34 -02:00
Claudio Sanches 2a5b785e50 Show (Untitled) in settings when payment method don't have title
Fixed some coding standards too.

Closes #9806
2015-12-09 15:11:59 -02:00
Mike Jolley d585e65e5a Use cache and invalidation for taxes
Closes #9712
2015-12-02 15:53:54 +00:00
Mike Jolley 1756aa8fca Use help tip function in email table. 2015-11-03 16:12:13 +00: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
Mike Jolley 1e945026b3 Tweak screen description 2015-11-03 15:41:31 +00:00
Mike Jolley 8457dbb57d Display if emails are manually sent 2015-11-03 15:40:10 +00:00
Mike Jolley d95f863d79 Show descriptions inline 2015-11-03 15:04:29 +00: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 5f65494e27 Restructure emails admin to avoid listing emails along the top
Moves emails to a table on the settings screen.

Also tweaks some section text and moves descriptions to tooltips for a
less cluttered interface.
2015-11-02 16:27:00 +00:00
Claudio Sanches b85ae9056c Rename wc_add_help_tip() function to wc_help_tip() 2015-10-23 13:09:08 -02:00
Claudio Sanches 2e95a68357 Use new "question" mark icon font
Created wc_add_help_tip() function to generate the icons
Replaced all .help_tip elements and [?]

We'll keep the old image and styles in order to maintain backwards
compatibility

Closes #9381
2015-10-23 01:40:52 -02:00
Mike Jolley d5409f5b5e Merge conflicts 2015-10-08 13:28:25 +01:00
Mike Jolley 0197a99065 Merge branch 'issue/8587'
Conflicts:
	assets/css/admin.css
	assets/css/woocommerce.css
	includes/admin/class-wc-admin-assets.php
	includes/admin/settings/views/html-settings-tax.php
2015-10-08 13:26:52 +01:00
Mike Jolley 8ee479afd7 Remove unused input 2015-10-08 13:25:01 +01:00
Mike Jolley ac02ec290a Improved styling and wording 2015-10-08 13:18:00 +01:00
Claudio Sanches 91c30310ee Fixed stock email recipient description typo, closes #9199 2015-09-22 13:06:10 -03:00
Florian Ludwig 35655f8544 Fixed all inefficient selector usages
Use find for more efficient selectors - more information on e.g.
https://24ways.org/2011/your-jquery-now-with-less-suck/
2015-09-07 19:51:10 +02:00
Caleb Burks c53248896e Allow for multiple email recipients
Allow multiple emails to be used for the low stock / out of stock email.
2015-09-01 07:11:41 -05:00
Mike Jolley 5e984faebc Allow HTML in store notice. 2015-08-24 16:15:16 +01:00
George Stephanis 81804d8d3b Don't show the `pre` displaying the changes by default. 2015-08-14 11:07:35 -04:00
George Stephanis 2aa1650f54 Rearrange things to get ajax working.
Spread them out throughout WooCommerce.
2015-08-13 17:49:59 -04:00
George Stephanis ec287f116f Add ajax submission processing.
Not quite finished yet, as the add_action isn’t catching.
2015-08-13 16:57:54 -04:00
George Stephanis 3a87b98ba6 Rewrite onAddNewRow for Backbone models. 2015-08-13 14:10:47 -04:00
George Stephanis b4bd433342 Update the unsaved message to give better data. 2015-08-13 11:58:09 -04:00
George Stephanis e10064d0fe Revert back to passing in array values. We can indexBy in JS 2015-08-12 17:17:39 -04:00
George Stephanis f77b77e335 New template for empty set. 2015-08-12 15:29:17 -04:00
George Stephanis 220550621a Populate the search field value attribute 2015-08-12 14:38:25 -04:00
George Stephanis 3ee43646ae Pass in the current page's base url to js for appending. 2015-08-12 14:18:49 -04:00
George Stephanis 4aedda5eb8 Indent the template file properly. 2015-08-12 13:52:04 -04:00
George Stephanis 56218b0824 Add in a notification for unsaved changes. 2015-08-12 12:59:13 -04:00
George Stephanis 8dc2126718 Update the tablenav so the gotos are never out of range. 2015-08-12 12:59:12 -04:00
George Stephanis 837931f99a Check for truthiness.
This avoids silliness where `’0’` evaluates to true.  Just parse it as
an int and evaluate that.
2015-08-12 12:59:11 -04:00
George Stephanis 2a0951e4e5 Add more data attributes to the rows and fields. 2015-08-12 12:59:11 -04:00
George Stephanis 1a066ebbe0 Swap to associative array for model. 2015-08-12 12:59:11 -04:00
George Stephanis ce7cb1f65d Add a `beforeunload` event to prompt before leaving with unsaved changes. 2015-08-12 12:59:10 -04:00
George Stephanis 8a416f105b Should be comparing to `'1'` not `1`. 2015-08-12 12:59:10 -04:00
George Stephanis ddba588987 Migrate the logic and queries out of the template file.
Move them where they belong, in the class that calls it.
2015-08-12 12:59:09 -04:00
George Stephanis 5f4cbf78d0 Remove the legacy pagination. 2015-08-12 12:59:09 -04:00
George Stephanis 4df13e6ffb Don't set them for unexistent rates. 2015-08-12 12:59:09 -04:00
George Stephanis 7bebbaff9e Pagination now works by first, prev, next, last.
Still need to get number based pagination working.
2015-08-12 12:59:09 -04:00
George Stephanis cf59aec17d Add in and populate pagination template.
The buttons don’t actually do anything yet, but it outputs accurately
and inherits core styles.
2015-08-12 12:59:09 -04:00
George Stephanis be4c7db8bd Pass rates in as an array, not an associative array, so it's an Array in js. 2015-08-12 12:59:08 -04:00
George Stephanis c9a1ba2f39 A default placeholder to show until the rendering code replaces it. 2015-08-12 12:59:08 -04:00
George Stephanis 536402c183 Insert placeholder divs for search and pagination. 2015-08-12 12:59:07 -04:00
George Stephanis 308c7f8676 Whitespace tweaks 2015-08-12 12:59:07 -04:00
George Stephanis 676af1f308 JSHint fixes.
The other advantage of splitting js out of php files — jshint can run
on it! :) :) :)
2015-08-12 12:59:07 -04:00
George Stephanis 52d4ea822c Extract 'No Rows Selected' string 2015-08-12 12:59:07 -04:00
George Stephanis 973348d6ad Whitespace tidy! 2015-08-12 12:59:06 -04:00
George Stephanis 18293cf365 Extract the autocomplete for states and countries data.
Localize it!
2015-08-12 12:59:06 -04:00
George Stephanis 5d5a64753d Migrate csv columns to localize script. 2015-08-12 12:59:06 -04:00
George Stephanis 39749c4563 Move js in from php template file. 2015-08-12 12:59:06 -04:00
George Stephanis a63ef876d7 Rename and tweak how js is registered.
Thanks @claudiosmweb for the suggestion to match existing conventions.
2015-08-12 12:59:06 -04:00
George Stephanis 0ed5f40fa2 Prefix template name with `wc-`
Good call, @mikejolley
2015-08-12 12:59:06 -04:00
George Stephanis a59ed70774 Big changeover to JS templating for the table.
Switching over to building the table with JS — wp.template.

We are now using the same JS template for existing rows and newly
generated rows on the fly — this should simplify things moving forward.

I’ve also started building stuff in an external JS file rather than
straight on the page.  Will continue migrating things to it and
localizing as needed.

Saved ( 2 * displayed tax rates - 1 ) db queries per page load by doing
the locations all in one query and then parceling them out in php.

More coming.
2015-08-12 12:59:06 -04:00
George Stephanis cb4e3cb774 Tax Rate Search: First whack.
This is by no means complete.  A number of things need to be relocated
and optimized still, but it does a rough search, purely in JS, and
highlights the results in yellow.
2015-08-12 12:59:05 -04:00
Mike Jolley ddd97b64c3 Remove white space to fix appearance of new rows
Fixes #8730
2015-08-06 11:38:46 +01:00
Shiva Poudel 0d1c2dc4dc Fix - calls for esc_* 2015-08-06 02:04:21 +05:45
George Stephanis 95e6b84fbb Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:15:00 -04:00
George Stephanis 29d9a7da8c Found two missing `esc_js()` calls as well. 2015-08-05 14:10:10 -04:00
George Stephanis c7ee929325 Partial _e() => esc_attr_e() changeover.
There’s a lot of them, so I’m breaking them into multiple commits.

This is safeguarding stuff in case some translation uses a double
quote, it will no longer risk breaking out of the attribute.
2015-08-05 14:10:09 -04:00
Claudio Sanches 054dfe0c7b Changed default Underscore's template for wp.template in API Keys 2015-08-05 15:02:55 -03:00
Fredrik Rossland 841beb95a6 Found a typo, "Permissons"
Changed "Permissons" to "Permissions"
2015-08-01 19:42:10 +02:00
Claudio Sanches eebd47ecf8 Improved truncated key description 2015-07-16 15:45:00 -03:00
Claudio Sanches e0be5a2e9f Added truncated consumer key and last access fields in woocommerce_api_keys table 2015-07-16 15:42:00 -03:00
Beka Rice 54e00fc84a Fix typo while creating API keys
adds missing closing parentheses around user email:
https://cldup.com/pvTlBGBMot.png
2015-07-15 17:30:41 -04:00
Mike Jolley ed451f278f Unused var 2015-07-15 16:37:29 +01:00
Mike Jolley 18c6a940f1 Merge branch 'onboarding'
Conflicts:
	assets/css/admin.css
	assets/css/select2.css
	assets/css/woocommerce-layout.css
	assets/css/woocommerce.css
	assets/js/admin/order-backbone-modal.min.js
	includes/admin/class-wc-admin-help.php
	includes/admin/class-wc-admin.php
	includes/admin/views/html-admin-page-status-report.php
	includes/admin/views/html-notice-install.php
	includes/admin/views/html-notice-template-check.php
	includes/admin/views/html-notice-theme-support.php
	includes/admin/views/html-notice-tracking.php
	includes/class-wc-install.php
	includes/class-wc-language-pack-upgrader.php

includes/shipping/international-delivery/class-wc-shipping-international
-delivery.php
2015-07-04 23:11:12 +01:00
Mike Jolley 14c88b49bc Tweak option labelling 2015-06-23 12:20:13 +01:00
Mike Jolley 4a9c2aece9 Update option wording 2015-06-17 14:27:42 +01:00
Mike Jolley 33c298fea7 Experiment with appending geolocation to query string to prevent caching 2015-06-17 12:12:49 +01:00