Commit Graph

169 Commits

Author SHA1 Message Date
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
Mike Jolley 8b4086caf2 Hide link to non-existing coupons 2017-08-24 17:08:34 +01:00
Mike Jolley f18a146d0f Prompt to apply fee in admin 2017-08-23 11:22:18 +01: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
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 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 6c0750e2e9 Discount lines and button 2017-08-09 14:55:42 +01:00
Claudio Sanches d2f9211ffb Removed non-existing classes from refunds form on admin 2017-07-04 17:27:25 -03: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 2a4103d776 Removed the non-functional order total input and combine the recalculation buttons into one working button.
Fixes #14494
2017-04-18 19:44:42 +01:00
Claudiu Lodromanean 955f20be80 Do custom buttons before Cancel and Save buttons 2017-03-31 11:28:00 -07:00
Mike Jolley dec52e8be2 Fix multiple item additon 2017-02-23 10:19:15 +00:00
Mike Jolley 96877dbb25 Fix product search inputs 2016-12-21 13:23:26 +00:00
Mike Jolley b81bde4f5a admin updates 2016-11-18 19:56:17 +00:00
Mike Jolley 5f4dbdb733 [Product CRUD] Variations - setters, getters and admin. (#12228)
* Started on variation changes

* Stock functions

* Variation class

* Bulk change ->id to get_id() to fix variation form display

* Missing status

* Fix add to cart

* Start on stored data save

* save variation

* Save_variations

* Variation edit panel

* Save variations code works.

* Remove stored data code and fix save

* Improve legacy class

* wc_bool_to_string

* prepare_set_attributes

* Use wc_get_products

* More feedback fixes

* Feedback fixes
2016-11-09 16:05:49 +00:00
Rami Yushuvaev f27499b501 i18n Improvements (#12078)
* use %s in translations strings

* merge simmilar error strings

* i18n: use sprintf() in translation strings to make them easier to understand for translators

* i18n: remove sprintf() function from translation string with unused parameter

* i18n: move colons and brackets into the translation strings

* revert comit addaa5d

* Fix broken sprintf()

* i18n: move colons into the translation strings on error messages

* Fix Travis-CI Error: operator must be surrounded by a single space
2016-10-24 08:33:32 +01:00
Rami Yushuvaev 4375618438 i18n context functions (#12156)
* Replace some context function with translation comments

* Remove two more context function

* Replace another context function with translation comments
2016-10-24 08:31:07 +01:00
Rami Yushuvaev fec057c993 Use get_admin_page_title() function to display admin titles (#12077)
*  Use get_admin_page_title() function to display admin titles

* revert

* i18n: use sprintf() in translation strings
2016-10-13 13:34:48 -03:00
Claudio Sanches 657c312cae Fix strings case (#12069)
* Fixed case for all _e, esc_attr_e and esc_html_e strings

* Fixed case for all _n_noop strings

* Fixed case for all _x strings

* Fixed case for all __, esc_html__ and esc_attr__ strings

* Fixed a few more strings

* Fixed strings in unit tests

* Fix PayPal Standard case.

* Save Order text
2016-10-12 11:16:30 +01:00
Mike Jolley 311c540662 Merge pull request #11833 from aristath/master
Coding Standards (2nd pass)
2016-09-07 10:14:17 +01:00
Mike Jolley cf59524dd7 Fix order total race condition in CRUD 2016-09-07 09:28:11 +01:00
Aristeides Stathopoulos e07511502d Additional coding-standards fixes. 2016-09-02 03:26:24 +03:00
Mike Jolley 7cf75f5085 Remove use of deprecated functions 2016-08-22 16:57:54 +01:00
Mike Jolley fdd7e797ba API get refunds 2016-08-22 13:15:15 +01:00
Mike Jolley 190cd0bf86 Remove direct access of item props in admin 2016-08-19 15:08:00 +01:00
Mike Jolley c3aa933ad2 coupon 2016-08-08 15:25:22 +01:00
Mike Jolley 75975de58a Item meta 2016-08-08 15:22:00 +01:00
Mike Jolley 39b4831e95 get_id 2016-08-05 15:56:23 +01:00
Mike Jolley 9181c107a8 get_currency 2016-08-05 15:49:17 +01:00
Mike Jolley d17b4de6d5 woocommerce_admin_order_item_bulk_actions
Closes #11099
2016-07-20 13:37:17 +01:00
Mike Jolley 36021ab1ac Improve no longer editable text
Closes #10916
2016-05-16 11:12:04 +01:00
Mike Jolley ba2bfdc685 Fix invalid closing tag 2016-05-16 10:17:44 +01:00
corsonr becc4ef841 use wc_help_tip() 2016-05-13 18:49:58 +02:00
corsonr ca040a3d1f Add a refund reason help bubble 2016-05-13 18:15:35 +02:00
Mike Jolley f73149feaf Tweak variation display and reenable bulk editing 2016-03-22 17:13:39 +00:00
Mike Jolley f1b3d0f708 Further layout tweaks 2016-03-22 14:54:02 +00:00
Mike Jolley 5862785522 Restyle items panel 2016-03-21 18:35:00 +00:00
Mike Jolley 7be2b129b6 Removed bulk actions from order items panel
Reduce/increase order item stock is less important these days do to
automatic stock reduction (when status changes) and because when you
refund items you can restock items via checkbox. Manual stock changes
can be performed by editing products.

Decreases complexity of order items box.
2016-03-21 14:58:14 +00:00
Jeff Stieler 16b65ea8c3 Fire action before order line items are rendered. 2016-03-18 15:25:31 -06:00
Mike Jolley 57c643c93e [2.5] Round tax/tax refunded amounts on display.
Closes #10162
2016-01-25 15:18:49 +00:00
Claudio Sanches c001d5b274 Make tooltips consistent, closes #9856 2015-12-16 03:38:53 -02:00
JeroenSormani 0bc4089ea7 Add hooks after order line items in admin 2015-12-09 09:29:32 +01:00
Claudio Sanches 7e63374aaf Merge pull request #8735 from shivapoudel/backbone-modal
Allow support for variable in backbone modal template in extensions
2015-09-15 19:44:50 -03:00
Kevin Hagerty 3671bcf39d Improve order total formatting
The function get_formatted_order_total already provides formatted HTML with indication of a prior refund. No need to do that logic and formatting again.
2015-09-05 07:48:24 -04:00
Shiva Poudel 4cc26ab799 Backbone modal template to support wp.template 2015-08-06 10:22:53 +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
Mike Jolley 7b2aec4791 Take item qty into consideration when refunding orders
Fixes #8675
2015-07-29 13:13:41 +01:00
adnanoner 725e3ee4e0 Add $order to action 'woocommerce_order_item_' . $item['type'] . '_html'
This comes in handy when you want change the line_items loop.
In my case I wanted to have a single line for each order items (per quantity) so I could edit the order and change the product for individual items. Would be appreciated if this could be merged.
2015-07-06 18:09:06 +02:00
Mike Jolley b9708c4df9 Show refunded total shipping and taxes
Closes #8222
2015-06-01 11:06:11 +01:00
Gustavo Bordoni 22393df867 The woocommerce_admin_order_item_headers action lacks a variable for context 2015-04-21 23:13:55 -03:00
Mike Jolley 26e7a5c705 Merge pull request #7865 from SiR-DanieL/scrutinizer-issues
Fix scrutinizer issues
2015-04-08 11:53:44 +01:00
shivapoudel 227c83a084 Use of <button> instead of <a> for modal-close
This was the clone of themes.php modal close button
2015-04-04 13:57:20 +05:45
shivapoudel 29f584ba98 Fix - Unusual slightly dark box on the backdrop of modal right side 2015-04-04 13:51:10 +05:45
Nicola Mustone 85fd634861 fix scrutinizer issues 2015-04-01 15:33:56 +02:00
Mike Jolley 0d64e3854d Add tooltips for manual and auto refunds Closes #7117 2015-01-19 14:50:06 +00:00
Mike Jolley a52f94fb42 $order_taxes check 2015-01-15 15:19:19 +00:00
Claudio Sanches 017831f1c6 Fixed the backbone modal 2015-01-12 15:11:01 -02:00
Mike Jolley 9852d9c6ec Order data JS select2 + refactor 2015-01-12 15:43:13 +00:00
Mike Jolley 5c86e962e8 Hide restock checkbox until qty is input Closes #6937 2015-01-05 17:19:18 +00:00
shivapoudel 39bf306f1a Fix add tax backbone modal backdrop issue 2015-01-02 20:00:21 +05:45
shivapoudel eab3a23b14 Fix missing icon for add tax backbone modal 2015-01-02 19:56:59 +05:45
Claudio Sanches 794621e3ba Improved the close button in backbone modal #7016 2015-01-02 11:58:57 -02:00
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00:00
Mike Jolley eba8206540 Merge branch 'tax-coupon-handling' Closes #6830
Conflicts:
	assets/js/admin/meta-boxes-order.min.js
	includes/api/class-wc-api-coupons.php
	includes/class-wc-cart.php
	templates/checkout/review-order.php
2014-12-03 12:33:15 +00:00
Mike Jolley 6df4c143cc Adjust total for partially refunded order totals
Closes #6666
2014-11-27 10:04:18 +00:00
Mike Jolley 4bc63de72a Added 'stupidtable' script to allow order item sorting on the order screen (by name, cost, qty).
Closes #5998
2014-11-26 15:37:06 +00:00
Mike Jolley 4a8c541fbf Remove 'order' discounts from classes 2014-11-25 11:05:14 +00:00
Mike Jolley 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00:00
claudiosmweb f34cead914 Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax() 2014-11-18 14:45:29 -02:00
Mike Jolley f8bc4a0abd Add item cost column Closes #6650
@jameskoster
2014-11-11 13:40:47 +00:00
Mike Jolley c62a13148b Instead of using saved title from order, use payment method_title for refund buttons
Closes #6334
2014-10-24 12:11:28 +01:00
thenbrent 94355b73dc Display order & item totals with correct currency
If a store changes currency or is using an extension which allows for
purchasing in multiple currencies, the currency symbol displayed on the
Edit Order admin screen may be incorrect for previous orders because
it uses the `wc_price()` fallback, which is the site wide currency
rather than the currency for that specific order. This fixes that.
2014-10-07 09:59:52 +10:00
Loushou a37ea4976b new filter for adding custom 'action buttons' on the order_items metabox in the admin edit order screen
loushou
2014-09-24 17:41:13 -07:00
Mike Jolley 0aca8e01f8 Merge pull request #6305 from quadshot/line-buttons
filter to allow custom 'add line' buttons
2014-09-22 10:23:46 +01:00
shivapoudel ae3bc4051f Absolute path, Indentation & docblocks fix for includes/admin/meta-boxes/*.php :) 2014-09-21 01:50:06 +05:45
Loushou 09159f83c7 removing extra param and correcting whitespace 2014-09-19 08:05:25 -07:00
Mike Jolley 4803937222 Fix adding items to orders
* Fix - When manually adding items to an order, show tax columns.
* Fix - When manually adding items to an order, include variation data.

Closes #6313
2014-09-19 12:52:26 +01:00
Loushou f17bb56891 filter to allow custom 'add line' buttons
loushou
2014-09-18 09:05:42 -07:00
Mike Jolley 28e13bdab3 Add notice when order is no longer editable.
Closes #6298
2014-09-18 11:32:25 +01:00
Mike Jolley 265ffee23a Remove $can_be_edited in favour of ->is_editable()
For #6154
2014-09-03 10:09:04 +01:00
thenbrent 78d932e6d2 Add WC_Abstract_Order::is_editable()
To centralise logic used to determine if an order can be edited from
the Edit Order screen
2014-09-02 11:47:56 -07:00
claudiosmweb cd154a30ef improved the line items backward compatibility, closes #6109 2014-09-01 12:35:04 -03:00
Mike Jolley e6defc0ddd Merge pull request #6127 from tamarazuk/master
Order totals: 4 new action hooks
2014-08-29 09:46:57 +01:00
thenbrent 175923056a Only display "Refund" when unrefunded amount > 0
If an order has been fully refunded, the "Refund" button was still
displayed despite there being no amount to refund.
2014-08-28 22:04:51 -07:00
Tamara Zuk eb9460aa2d Order totals: 4 new action hooks 2014-08-28 21:56:30 -04:00
Mike Jolley 5bc293a69c Initial display of add order item buttons Fixes #5991
Also Closes #5994
2014-08-12 12:54:44 +01:00
Barry Kooij e49237c692 Added isset() checks around $legacy_order, var is only set if 'woocommerce_calc_taxes' option is 'yes'. 2014-07-30 11:13:09 +02:00
Mike Jolley 8a6831f33b Hide tax columns for legacy orders
@claudiosmweb
2014-07-28 17:08:11 +01:00
Mike Jolley bf86072cce Interface tweaks
#3164
2014-07-28 11:41:52 +01:00
Mike Jolley 5e663a7fa8 Show refunded line items inline 2014-07-25 16:48:19 +01:00
Mike Jolley a7eaefc374 Change button label for calc taxes 2014-07-25 10:48:47 +01:00
claudiosmweb 5b3f69de0a fixed the "calculate tax" action #3164 2014-07-24 17:33:26 -03:00