Commit Graph

848 Commits

Author SHA1 Message Date
Claudio Sanches 9e93d99056 Fixed "PHP Warning: printf(): Too few arguments" 2017-12-05 16:57:26 -02:00
Mike Jolley 0a9485c465 Merge branch 'master' into feature/11259
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/list-tables/class-wc-admin-list-table-products.php
#	includes/class-wc-install.php
#	includes/wc-update-functions.php
2017-12-04 14:14:03 +00:00
Shiva Poudel a0215d85da Txn clickable (#17878)
* Make transactional link clickable

* Oops, fix in modal tmpl
2017-11-23 10:18:23 +00:00
claudiulodro 5513dc4546 Update with master 2017-11-22 11:02:14 -08:00
Mike Jolley 3773b81bc9 Merge branch 'master' into update/order-screen-refinements
# Conflicts:
#	includes/admin/meta-boxes/views/html-order-item.php
2017-11-22 16:32:34 +00:00
The Dramatist 1783953f15 Admin metaboxes views translation escaping fix (#17776)
* Data escaped and validated. Plus translator comment documentation added.

* If it should be int then we should change the empty string default parameter to 0 as in 'if' condition checking 0 and empty string are same.

* Extra bracket removed.

* Indentation is fixed now.

* The taxonomy object should not be assigned to a variable before checking if this is a taxonomy or not.

* echo esc_attr__ replaced by esc_attr_e and visually tested.

* As I use WordPress VIP Coding Standard, they were marking them as warnings. But now it's fixed again.

* Escaping fix

* Extra Bracket Fix Again
2017-11-21 17:50:30 +00:00
Mike Jolley 98bebd14f2 Hooks for columns and preview list tables 2017-11-21 16:22:43 +00:00
claudiulodro a73436bdcd Merge remote-tracking branch 'origin/master' into HEAD 2017-11-20 14:43:12 -08:00
Mike Jolley 698db6c131 When custom attributes are created, they are decoded. Make the values match.
When we create/link variations, the entities are decoded.

When the variation form is posted, the entities are encoded (esc_attr).
This decodes them so they match correctly. Fixes #17820
2017-11-20 20:51:32 +00:00
The Dramatist 67aced7d62 Unused variable removed and some comment added. (#17786) 2017-11-20 11:47:16 +00:00
claudiulodro 0390cf3e26 Bring up-to-date with master 2017-11-16 10:06:07 -08:00
claudiulodro dd0f748211 Fix invalid html 2017-11-16 08:01:59 -08:00
Mike Jolley 541dde95b3
Merge pull request #17710 from woocommerce/fix/17697-coupon-spend-incl-taxes
Coupon min/max spend based on displayed subtotal
2017-11-16 10:59:43 +00:00
Gerhard Potgieter 3af77f13d8 Change tooltip to just say subtotal 2017-11-16 12:28:43 +02:00
claudiulodro 4ef2152881 Hide/set fields depending on whether managing stock 2017-11-15 14:10:06 -08:00
Gerhard Potgieter 4521011219 Adjust discount on min/max spend to work based on the displayed subtotal. 2017-11-15 13:44:07 +02:00
Mike Jolley 8dcd7f5b59
Merge pull request #17696 from yratof/patch-1
Removed class within class for admin meta boxes
2017-11-15 10:02:19 +00:00
claudiulodro 3050959836 Variations stock status 2017-11-14 14:18:03 -08:00
Andrew Lazarus ba52e583f9
Removed class within class
'<div class="class="wc-order-item-name"">` outputs `<div class="class=" wc-order-item-name="">`
2017-11-14 16:01:57 +01:00
Mike Jolley 3621736400 PHPCS 2017-11-13 16:24:33 +00:00
Mike Jolley f1f30fc8de Fix download link 2017-11-13 16:10:32 +00:00
Mike Jolley 3e7968d37b Merge branch 'master' into pr/16418 2017-11-13 14:37:18 +00:00
Mike Jolley 9f6f5f9f17
Merge pull request #17609 from woocommerce/update/17254-input-to-button
Convert input submit elements to button submit elements
2017-11-07 19:21:04 +00:00
Gerhard Potgieter 0c5a208057 Change input to button for submit in class-wc-meta-box-order-actions.php 2017-11-06 15:23:00 +02:00
Gerhard Potgieter 8bb051fdcf PHPCS fixes for class-wc-meta-box-order-actions.php 2017-11-06 15:20:37 +02:00
Mike Jolley 90203dc704 Set placeholder for variation lxwxh
Fixes #17559
2017-11-06 10:44:49 +00:00
Mike Jolley 2e1e9291bc Remove trailing `.`
@claudiulodro Only affects master.
2017-11-02 18:29:34 +00:00
Mike Jolley ff02941a53 Merge branch 'pr/17434' 2017-11-01 12:32:52 +00:00
Mike Jolley 80dfbc0ced phpcs tweaks and escaping 2017-11-01 12:32:35 +00:00
veisis fbd1b114db
Class name fix in docblock 2017-11-01 11:59:49 +02:00
Shiva Poudel 289842aacf Tweak - Order panel meta description 2017-10-28 06:37:29 +05:45
Gerhard Potgieter 1ee7033678 Only invoice in dropdown, too many customer usage. 2017-10-27 17:05:35 +02:00
Gerhard Potgieter 980d688ca0 Change invoice email title to "Customer invoice / Order details" 2017-10-27 15:01:02 +02:00
Gerhard Potgieter e4c961c3ba Merge pull request #17194 from woocommerce/update/email-tweaks
Email template and admin tweaks
2017-10-13 17:10:08 +02:00
Mike Jolley 7df8f6bec6 Resend new order notification option
@kloon Stole your code.

Ref: #17186
2017-10-13 14:54:12 +01:00
Mike Jolley 98eeafcc29 Hide shipping/discount rows when not needed and match email wording. 2017-10-13 14:01:20 +01:00
claudiulodro b5e02ea6f6 Add extra lines back in admin order summary 2017-10-12 14:01:11 -07:00
Mike Jolley e0421cd7bc Replay protection on refunds
Sends the current refunded amount with the request, so if a refund is
attempted twice it will mismatch.

Fixes #13614
2017-09-28 16:17:13 +01:00
Claudio Sanches 6164be51d3 Escape classes in data panel 2017-09-25 10:56:14 -03:00
Mike Jolley 45aaa22bb9 correct isset 2017-09-25 12:22:17 +01:00
Shakeeb Sadikeen da6a37c0d1 fixed : custom tab with no class error
when class is not passed with custom tab. echo's undefined index error with classes fixed
2017-09-20 22:14:58 +05:30
Mike Jolley 8b4086caf2 Hide link to non-existing coupons 2017-08-24 17:08:34 +01:00
Josh Smith 49c7449e8b Merge remote-tracking branch 'upstream/master' 2017-08-23 22:41:04 +00:00
Mike Jolley f18a146d0f Prompt to apply fee in admin 2017-08-23 11:22:18 +01:00
Josh Smith 1734580b0a [#12517] Order download permissions: Use i18n number formatting on download count and proper escaping on report links 2017-08-23 03:03:27 +00:00
Josh Smith 413444c616 Merge remote-tracking branch 'upstream/master' 2017-08-20 04:09:17 +00:00
Claudiu Lodromanean a4d3518a61 Merge pull request #16508 from woocommerce/remove-manual-discounts
Removed manual discounts code
2017-08-18 08:30:07 -07:00
Mike Jolley 1f692ffb64 Merge pull request #16485 from Korkey128k/master
Wrapped 'Delete selected row(s)' button in condition
2017-08-18 15:38:14 +01:00
Mike Jolley e99471c0cd Removed manual discounts code 2017-08-18 10:36:10 +01:00
Corey Smith a6cf08d8cf Wrapped 'Delete selected row(s)' button in condition 2017-08-16 11:56:30 -05:00
Rami Yushuvaev 4ae42313ce i18n: Rewrite the translation string logic
The single translation string `by` is not easy to translate without a context. In this case, using the context function `_x()` is not the best solution.

A better way would be to create two complete translation strings for refund with a user and without a user.
2017-08-16 14:25:38 +03:00
Claudiu Lodromanean 15179b0e48 Merge pull request #16416 from woocommerce/manual-discounts-on-fees-shipping
Manual discounts on fees and shipping
2017-08-11 11:30:27 -07:00
claudiulodro 46e003d3c6 Remove shipping and discount lines 2017-08-11 11:10:44 -07:00
Mike Jolley 2c5a5b9409 Discounts should be last 2017-08-11 16:15:53 +01:00
claudiulodro 3618ef1725 Handle couple todos 2017-08-10 13:37:05 -07:00
claudiulodro 9e70a74857 Styling 2017-08-10 13:29:32 -07:00
Mike Jolley e2599d83c8 Apply methods 2017-08-10 14:22:27 +01:00
claudiulodro a416ebe09b It kind-of works. 2017-08-09 14:55:35 -07:00
Mike Jolley e429a27ba4 No need for 'off' 2017-08-09 19:12:33 +01:00
Mike Jolley c556facd41 Fix percent coupon and display 2017-08-09 19:02:10 +01:00
Mike Jolley f71dc64d35 Manual discounts and negative taxes 2017-08-09 18:53:10 +01:00
Mike Jolley f0a9050241 HTML 2017-08-09 16:17:30 +01:00
Mike Jolley 6c0750e2e9 Discount lines and button 2017-08-09 14:55:42 +01:00
Josh Smith 644ac674d7 [#12517] Replace download_id on customer download and product download with static UUID instead of filename based hash, to preserve download links, logs, and permissions across filename changes 2017-08-05 04:42:31 +00:00
Josh Smith 677b81174e [#12517] Add statistic on download count to download permissions listings on order details page 2017-08-05 04:35:37 +00:00
Josh Smith dfeead42a5 [#12517] Add download log report to WC admin reports, with link from Order details Downloads section 2017-08-03 21:24:53 +00:00
Mike Jolley 916294b7d0 Use comment_status input name
Closes #16153
2017-07-19 15:18:33 +01:00
Jaydeep Rami 3522857d23 Fix typo in WooCommerce plugin (#16135)
* Fixed typo

* Fixed more typo

* Fixed more typo

* Fix tyop

* Fix more typo

* Fix more typo

* Fix typo

* Fix typo

* Fix typo

* Fix typo datatime object

* Fix short name of compat

* Fix typo: update short name

* Fix typo "deactive" to "deactivate" and short BW - Compat

* Fix typo "Backwards compat"

* Fix typo 'parameters'

* Fix more typo 'pararmeters'

* Fix typo 'compund'

* FIx typo order

* Fix typo

* Fix typo 'incorrecly'

* Fix typo 'genarate'

* Fix typo 'reletive'

* Fix typo 'Handly'

* Fix typo 'rotatated'

* Fix typo

* Fix typo 'additonal'

* Fix typos
2017-07-17 11:10:52 +01:00
Mike Jolley f63b2e24df Merge pull request #16125 from websupporter/issue-16124
Switch to coupons internal get_email_restrictions() (solves #16124)
2017-07-14 12:34:43 +01:00
websupporter 72baa43fe2 switch to coupons internal get_email_restrictions() 2017-07-14 13:37:00 +03:00
Claudio Sanches 97f9dab0ce Applies wc_get_order_notes() on admin 2017-07-13 19:33:20 -03:00
Claudio Sanches 66895afb38 Added comment to remember about CloudFlare email obfuscation 2017-07-07 18:26:53 -03:00
Claudio Sanches 86d09b0c6a Avoid CloudFlare email obfuscation.
Closes #15082
2017-07-07 15:45:05 -03:00
Mike Jolley f79f5bb5cb Simply enables drag and drop sorting on the grouped product field
Fixes #14560
2017-07-07 14:20:30 +01:00
Claudio Sanches 10f039ad79 Merge pull request #15827 from woocommerce/fix/15818
If stock changes between page load and editing, reject stock changes
2017-07-05 15:49:58 -03:00
Mike Jolley beba2757ee feedback 2017-07-05 17:11:34 +01:00
Claudio Sanches d2f9211ffb Removed non-existing classes from refunds form on admin 2017-07-04 17:27:25 -03:00
Claudio Sanches 2d8902c91f Hide Cross-sells if external, removed in #15692 2017-07-04 16:44:08 -03:00
Claudio Sanches 74cba6f863 Merge branch 'master' into grouped-products-settings-improvement 2017-07-04 16:41:33 -03:00
Job f67bf6892e Coupon help (#15958)
* Solves #15945

Change description of help tip to be accurate for current coupon system

* update caps use on PR
2017-07-04 12:07:26 +01:00
Mike Jolley 58593a154d Admin status update should be marked as a manual status transition
Closes #15874
2017-06-30 11:40:52 +01:00
Mike Jolley 1265633286 If stock changes between page load and editing, reject stock changes
Fixes #15818
2017-06-27 21:22:46 +01:00
Caleb Burks cfbd56c04a Remove some settings for grouped products
Purchase notes and Cross-sells aren’t needing as you can never add a grouped product to your cart or purchase it.
2017-06-20 21:04:56 -05:00
Caleb Burks f13c4c3b30 Hide Cross-sells for external products 2017-06-20 20:56:54 -05:00
Mike Jolley 91511bd92a Merge pull request #15631 from woocommerce/update/13738
Create a way to 'resend order details'
2017-06-20 15:09:10 +01:00
Caleb Burks ae6a5e34f2 Move “Grouped products” setting to the top 2017-06-19 21:59:42 -05:00
Mike Jolley acf0026834 Update description for exclude_sale_items 2017-06-19 11:56:04 +01:00
Mike Jolley 3c6635a0f6 Remove all emails except for the invoice email 2017-06-15 15:14:10 +01:00
Job 8b48accc01 Upsell/up-sell
We had a few different usages of up-sells and upsells in the copy -
“Upsells” were used more and also seems to be more correct English so
I’ve updated the “up-sells”
2017-06-15 15:56:01 +02:00
Mike Jolley 75041b6dca Remove email based actions from order screen 2017-06-15 14:19:05 +01:00
Mike Jolley 4a56c8b92a Fix indent 2017-06-09 09:36:44 +01:00
nishitlangaliya 9ba5f534ea Fixed Don't show 'Restock refunded items' ref #14888 2017-06-09 09:06:57 +05:30
Mike Jolley 5ee38c54c2 Option to disable reviews globally 2017-06-08 15:26:30 +01:00
Mike Jolley d62aefba74 Merge branch 'master' into fix/15414
# Conflicts:
#	includes/wc-core-functions.php
2017-06-06 12:55:50 +01:00
Claudio Sanches 6c42f3c16a Properly sanitization for wc_make_phone_clickable() and fixed coding standards
Closes #14659
2017-06-05 16:15:04 -03:00
Claudio Sanches f65005be41 Merge pull request #14719 from avinapatel/fix-14659
Made the buyer phone number clickable in the in the order backend.
2017-06-05 15:47:16 -03:00
Mike Jolley 67a0637417 Advanced locale switching 2017-06-05 14:18:39 +01:00
Peter 314f64b566 Change the name of the new action
Change the name of the new action to woocommerce_after_order_fee_item_name.
2017-05-28 20:40:59 +02:00
Peter 05516dbea5 New action for display order fee custom data
We need to display custom data in fee lines, similarly to woocommerce_after_order_itemmeta action in shipping line items.
2017-05-26 10:05:26 +02:00
Dixita Dusara fe4a4a7e83 Update issue Undefined index warning when saving variations with stock management disabled #15242 (#15271)
* Issue Undefined index warning when saving variations with stock management disabled #15242

* updated issue as per your suggestion for index warning when saving variations with stock management disabled #15242
2017-05-25 10:58:32 +01:00