Remi Corson
fd80f61609
fix variable product docs URL
2015-03-13 17:51:50 +01:00
Mike Jolley
01ee531136
Same as #7662 for backend
2015-03-09 13:48:47 +00:00
Brent Shepherd
32cd95cc80
Order "Order Notes" on Edit Order screen by ID
...
So that insertion order is preserved in case multiple comments were inserted within
the same second of each other.
2015-03-05 15:49:45 -08:00
Claudio Sanches
37882756d3
Fixed HTML entities for up-sells and cross-sells fields, closes #7553
2015-02-25 10:27:53 -03:00
pjv
1cdc3174ca
fix BadMethodCallException
...
receiving lines like this in the php error log:
Fatal error: Uncaught exception 'BadMethodCallException' with message 'Call to a member function get_formatted_name() on a non-object (boolean)' in /var/www/example.com/htdocs/wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php:484\nStack trace:\n#0 /var/www/example.com/htdocs/wp-admin/includes/template.php(1044): WC_Meta_Box_Product_Data::output()\n#1 /var/www/example.com/htdocs/wp-admin/edit-form-advanced.php(600): do_meta_boxes()\n#2 /var/www/example.com/htdocs/wp-admin/post.php(209): include()\n#3 {main}
The error resulted in a WSOD when trying to edit some products.
2015-02-22 09:01:37 -07:00
Mike Jolley
2a90208f93
Cross/up-sells should not search variations.
...
Closes #7502
2015-02-20 12:12:03 +00:00
Mike Jolley
82ac0fc11e
Detect shortcodes when saving URLs.
...
Fixes #7474
2015-02-19 11:05:04 +00:00
Claudio Sanches
517a447743
Fixed some issues for scrutinizer
2015-02-18 16:09:02 -02:00
Mike Jolley
7899dd95d6
Run File URLs through esc_url_raw instead of wc_clean to preserve spaces.
...
Closes #7442
2015-02-16 14:23:13 +00:00
Mike Jolley
8bdd4fc283
Run item meta label through wc_attribute_label() in admin order page.
...
Closes #7420
2015-02-16 13:49:44 +00:00
James Collins
0bbb4464ab
Fix 2 undefined index notices when editing/saving a product
...
Fixes:
Notice: Undefined index: upsell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1202
Call Stack
# Time Memory Function Location
1 0.0110 486692 {main}( ) ../post.php:0
2 4.7790 60047856 edit_post( ??? ) ../post.php:229
3 4.7917 60075016 wp_update_post( ???, ??? ) ../post.php:321
4 4.7930 60089156 wp_insert_post( ???, ??? ) ../post.php:3572
5 4.9212 60223012 do_action( ???, ???, ???, ??? ) ../post.php:3499
6 4.9213 60224380 call_user_func_array ( ???, ??? ) ../plugin.php:496
7 4.9213 60224412 WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? ) ../plugin.php:0
8 7.2460 60224516 do_action( ???, ???, ??? ) ../class-wc-admin-meta-boxes.php:207
9 7.2539 60199340 call_user_func_array ( ???, ??? ) ../plugin.php:496
10 7.2890 60735660 WC_Meta_Box_Product_Data::save( ???, ??? ) ../plugin.php:0
( ! ) Notice: Undefined index: crosssell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1203
Call Stack
# Time Memory Function Location
1 0.0110 486692 {main}( ) ../post.php:0
2 4.7790 60047856 edit_post( ??? ) ../post.php:229
3 4.7917 60075016 wp_update_post( ???, ??? ) ../post.php:321
4 4.7930 60089156 wp_insert_post( ???, ??? ) ../post.php:3572
5 4.9212 60223012 do_action( ???, ???, ???, ??? ) ../post.php:3499
6 4.9213 60224380 call_user_func_array ( ???, ??? ) ../plugin.php:496
7 4.9213 60224412 WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? ) ../plugin.php:0
8 7.2460 60224516 do_action( ???, ???, ??? ) ../class-wc-admin-meta-boxes.php:207
9 7.2539 60199340 call_user_func_array ( ???, ??? ) ../plugin.php:496
10 7.2890 60735660 WC_Meta_Box_Product_Data::save( ???, ??? ) ../plugin.php:0
2015-02-09 11:51:33 +08:00
Mike Jolley
7694f8039c
Dead vars when saving variations
2015-02-03 14:08:43 +00:00
Mike Jolley
447ee6e7bb
Docblocks
2015-02-03 14:02:38 +00:00
Mike Jolley
c11d283ddc
Still trying to get scruit to pick up these variables. Testing a few variations.
2015-02-03 13:49:04 +00:00
Mike Jolley
7c019c0c50
More docblocks; the check for WP_POST isn't needed as the second case (isset) runs regardless and is true for posts
2015-02-03 13:13:07 +00:00
Mike Jolley
52c84f407c
Fix download save after adding with ajax
2015-02-03 10:57:43 +00:00
Jack Gregory
836a87d6e7
Add hook to admin product advanced data
2015-02-01 15:17:07 +00:00
Tamara Zuk
c1100fbce5
Reviews meta box: avoid undefined index notice
...
Avoids a notice when updating some Product Reviews Pro review types
2015-01-31 14:05:51 -05:00
Mike Jolley
9f8a7d1199
Remove datepicker icon's and use focus event
2015-01-30 12:54:33 +00:00
Mike Jolley
064f2ebe17
Fix multiple product section in coupon section. Fixes #7170
2015-01-21 14:24:39 +00:00
Mike Jolley
2693e110c6
Correct @var syntax.
2015-01-20 11:35:59 +00:00
Mike Jolley
c0bea39c95
Seeing if magic properties are recognised
2015-01-20 11:06:15 +00:00
Mike Jolley
562743e847
Another @var declaration
2015-01-20 10:52:08 +00:00
Mike Jolley
0e4026941b
Move $current_tab to where used
2015-01-20 10:41:26 +00:00
Mike Jolley
0e9bb50aae
Docblock experiments continued...
2015-01-20 10:29:54 +00:00
Mike Jolley
bc45f7755f
Testing to see if scruitinizer recognises docblock
2015-01-20 10:01:28 +00:00
Mike Jolley
0b393b7e82
Add comment #7163
2015-01-20 09:43:56 +00:00
Brent Shepherd
f9f3054c22
Restore $theorder
...
SHA: 74ba11c189
removed instantiation of `$theorder` global in `WC_Meta_Box_Order_Actions::output()`
as it was mistaken for unused code. However, some callbacks attached to hooks in that function may
actually rely on that global to determine if actions should be displayed for certain orders.
2015-01-19 17:12:26 -08:00
Mike Jolley
0d64e3854d
Add tooltips for manual and auto refunds Closes #7117
2015-01-19 14:50:06 +00:00
Claudio Sanches
505501912f
Fixed "PHP Notice: Undefined variable: metabox_class" error for non-taxonomy attributes
2015-01-19 11:38:47 -02:00
Nicola Mustone
47b0c4cb97
clearer coupon option description
2015-01-19 09:18:44 +01:00
Claudio Sanches
a82aa2bd13
Fixed refund amount when product dont have taxes
2015-01-15 16:57:33 -02:00
Claudio Sanches
b3d6f6358e
Fixed the selected attributes in product variations panel, closes #7115
2015-01-15 16:01:55 -02:00
Mike Jolley
a52f94fb42
$order_taxes check
2015-01-15 15:19:19 +00:00
Mike Jolley
e1c54687ac
Minor issues with variables
2015-01-14 12:17:19 +00:00
Mike Jolley
206a650488
Tidy variation output
2015-01-14 12:17:09 +00:00
Mike Jolley
8d8e57cbf5
Use @var to define vars passed in
2015-01-14 11:46:03 +00:00
Mike Jolley
32f2a44091
define @global
2015-01-14 11:32:00 +00:00
Claudio Sanches
3ddcc68a19
includes/admin/meta-boxes/class-wc-meta-box-webhook-data.php
...
Removed old webhook file
2015-01-13 16:32:54 -02:00
Mike Jolley
550e569a29
Tweak placement and styling of view link. #7065
2015-01-13 12:27:07 +00:00
Mike Jolley
9b8c23e2bd
Merge pull request #7065 from pagelines/master
...
Link to find all customers orders from order page.
2015-01-13 12:16:51 +00:00
Claudio Sanches
695b04be61
Fixed conflits
2015-01-12 16:02:46 -02:00
Claudio Sanches
017831f1c6
Fixed the backbone modal
2015-01-12 15:11:01 -02:00
Mike Jolley
8110a8376b
Upsells and cross sells select2
2015-01-12 16:39:49 +00:00
Claudio Sanches
60b23e6f6f
Merge branch 'chosen-to-select2' of github.com:woothemes/woocommerce into chosen-to-select2
2015-01-12 13:48:43 -02:00
Mike Jolley
9852d9c6ec
Order data JS select2 + refactor
2015-01-12 15:43:13 +00:00
Mike Jolley
2e82cbb311
Customer ajax searches
2015-01-12 13:04:19 +00:00
Mike Jolley
1fa26f1f6e
Product searches select2
2015-01-12 11:56:44 +00:00
Nicola Mustone
f00cd875f1
Typo
2015-01-12 12:31:42 +01:00
Mike Jolley
4b7f97c1de
Attributes
2015-01-09 16:53:47 +00:00
Simon
42c570114c
Add some spaces.
2015-01-08 18:55:26 +00:00
Claudio Sanches
03193b867b
Creted new webhooks edit interface
2015-01-08 16:34:30 -02:00
Simon
4003acd1e6
Link to find all customers orders from order page.
...
Moved to master branch as instructed.
Added check to only display if valid customer.
Removed pointless ?><?php
2015-01-08 16:57:40 +00:00
Mike Jolley
5c86e962e8
Hide restock checkbox until qty is input Closes #6937
2015-01-05 17:19:18 +00:00
Claudio Sanches
e53a6f5e57
Fixed variation fields when use "Link all variations" button
2015-01-02 15:07:31 -02: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
Claudio Sanches
28d960d5bb
Added variable_pricing class/wrap for variable price fields, closes #7008
2014-12-23 14:12:12 -02:00
Mike Jolley
22cc1fb0c7
Add attributes with ajax and don't load all attributes at once.
...
Significantly improves performance with many attributes in admin.
Closes #6852 cc @claudiosmweb
2014-12-22 14:16:15 +00:00
Rtransat
d53210dfbf
Fix label "for" attribute for products_categories
2014-12-19 17:15:24 +01:00
Claudio Sanches
690b04b29a
Improved the webhook meta boxes
2014-12-17 16:20:37 -02:00
Claudio Sanches
67f90fbb87
Created webhook logs meta box
2014-12-17 15:50:19 -02:00
Claudio Sanches
9b9243fb92
Validated webhook delivery_url and topic
2014-12-17 10:45:20 -02:00
Claudio Sanches
6ccf391168
Improved the webhook data class and send a webhook ping when create a new
2014-12-17 10:42:39 -02:00
Claudio Sanches
5b318b1d2a
Added the wc_is_webhook_valid_topic() and wc_is_valid_url() conditional functions
2014-12-17 10:16:14 -02:00
Claudio Sanches
429c91708b
Improved the WC_Meta_Box_Webhook_Data:save() method
2014-12-17 09:29:43 -02:00
Claudio Sanches
509147b105
Created webhook actions meta box
2014-12-16 20:18:06 -02:00
Claudio Sanches
4d3673c4c2
Created webhook data meta box class
2014-12-16 19:05:03 -02:00
Mike Jolley
65dbab486c
[2.2] Don't force tax_rate_id to an integer. Allow strings.
...
Used in Taxamo extension.
2014-12-11 11:06:01 +00:00
Brent Shepherd
40de60ea3e
Give child class access to billing/shipping fields
...
So that custom order types can extend `WC_Meta_Box_Order_Data` for their
own purposes without having to redefine all the billing/shipping fields
2014-12-10 18:46:32 -08:00
Brent Shepherd
1f2375f7e4
Make no order notes label more generic
...
To account for it being displayed on custom order type Add/Edit screens
where the order type is not referred to as an 'Order' (e.g. a 'Subscription',
'Refund' or 'Pre-order').
2014-12-10 18:46:32 -08:00
Brent Shepherd
b0c2f05a6a
Use post type label for "Save Order" button
...
To improve compatibility with custom order types
Conflicts:
includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
2014-12-10 18:46:15 -08:00
James Koster
316b43f770
coupons. closes #6836
2014-12-09 16:06:34 +00:00
Mike Jolley
95a504cf84
Fix admin term output
...
Resolves an issue decoding foreign chars caused by #6555
Fixes #6550
2014-12-09 09:54:42 +00:00
Mike Jolley
b470e64b61
Error in previous commit.
2014-12-08 12:34:42 +00:00
Mike Jolley
80d08787a8
Correctly save custom address fields in admin
2014-12-08 12:30:11 +00:00
Mike Jolley
cf694bcae6
Merge pull request #6875 from tamarazuk/limit-order-action
...
Execute `woocommerce_order_action_{$action}` only once
2014-12-05 14:04:47 +00:00
Mike Jolley
6a45f8f196
Merge branch 'master' of https://github.com/woothemes/woocommerce
2014-12-03 12:33:19 +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
Claudio Sanches
8fac703f97
Added missing textdomain
...
cc @bryceadams #fail
2014-12-03 10:30:32 -02:00
Bryce
80ccc7b09d
Add help tip for schedule sales info
...
Closes #6863
2014-12-03 13:20:24 +07:00
Tamara Zuk
f63c5e8c8f
Execute `woocommerce_order_action_{$action}` only once
...
Prevents a “Maximum function nesting level reached” fatal error in
certain cases.
Since this ends up running on `’save_post’`, updating something like
the order status while hooked onto to
`woocommerce_order_action_{$action}` causes a fun recursion :)
2014-11-30 00:14:22 -05:00
splashingpixels
13ad1100c5
undefined index when product image gallery side meta box is removed fixes 6855
2014-11-27 20:42:58 -08: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
3904035003
Disable already added attributes #6189
2014-11-26 11:35:07 +00:00
Mike Jolley
4a8c541fbf
Remove 'order' discounts from classes
2014-11-25 11:05:14 +00:00
Mike Jolley
549d7ab2c0
Removed 'apply before tax' options for coupons - this should be the default core behaviour
2014-11-24 17:24:25 +00:00
Mike Jolley
8b4332a037
Refactors to shipping tax rate methods
2014-11-21 13:06:33 +00:00
claudiosmweb
74ba11c189
Removed some unused code
2014-11-19 21:36:47 -02: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
Nicola Mustone
22a32ae9c8
Fixes #6555
2014-11-18 14:20:47 +01:00
Mike Jolley
a0bf72f7b5
Bulk edit sales schedule on variations
...
Closes #6300
2014-11-17 16:50:25 +00:00
Mike Jolley
2e2ce3c286
[2.2] During refunds, correctly set shipping tax totals
...
Fixes #6691
2014-11-14 12:52:43 +00:00
Mike Jolley
f8bc4a0abd
Add item cost column Closes #6650
...
@jameskoster
2014-11-11 13:40:47 +00:00
Mike Jolley
01091c304c
Fix conflicts in #5949
2014-11-11 11:23:44 +00:00
Nicola Mustone
011bb0a784
Added cancelled order admin email
2014-10-29 15:05:43 +01:00
Mike Jolley
3d1285c8c4
Allow some limited html in text attributes
...
Fixes #6620 . @claudiosmweb @barrykooij see any issues with adding this
one? Doesn’t appear to break anything…
2014-10-29 10:29:51 +00:00
claudiosmweb
a5ad428faf
[2.2] fixed the value format in stock field with wc_stock_amount(), closes #6622
2014-10-28 18:37:53 -02:00
Mike Jolley
2b8be95360
Remove # (hash) from get_order_number and add to strings instead as needed.
...
Most places use Order #X
Some places use Order Number: X
Both are now valid.
Fixes #6518
2014-10-24 14:53:43 +01: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
Nicola Mustone
dcde2a52e2
Removed GMT
2014-10-22 17:31:12 +02:00
Nicola Mustone
cbbdfadb74
Order note use comment_date instead of GMT date
...
The order comment note should not use always GMT date. I think using `comment_date` is better.
Ref Ticket: #224994
2014-10-22 17:28:25 +02:00
Mike Jolley
997e7e7910
extra sanitisation for product data
2014-10-22 12:12:25 +01:00
James Koster
e27d4afee1
data tabs tweaks. #6562
2014-10-17 14:50:23 +01:00
James Koster
eb258950bd
variations markup / css refactor. #6562
2014-10-17 12:17:30 +01:00
Barry Kooij
acf6644830
Confirm to user email is sent when sending email from within order edit screen.
...
Fixes #6461 .
2014-10-14 15:18:09 +02:00
Mike Jolley
5c1b931438
[2.2] Fix refund date.
...
Fixes #6499
2014-10-09 16:43:26 +01:00
Mike Jolley
02f5ed7542
Merge pull request #6327 from SiR-DanieL/order-notes
...
Fixing order notes date
2014-10-09 12:39:00 +01:00
Mike Jolley
853e17d28f
[2.2] Prevent address fields being empty when editing an address within an order
...
Fixes #6476
2014-10-08 15:13:26 +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
Mike Jolley
589da28f42
Small tweak on text in #6457
2014-10-06 14:31:32 +01:00
Bryce
5a6f0b1529
Re-do coupon free shipping option desc issue #6391
...
I didn’t update the POT as was having some poedit issues
2014-10-03 16:44:57 +07:00
Mike Jolley
819436f0a3
Merge pull request #6388 from quadshot/action-buttons
...
Allow adding custom 'action buttons' in order item metabox
2014-10-02 14:06:11 +01:00
Mike Jolley
3e20b113d6
Add hook to refund html
...
Closes #6406
2014-10-02 13:40:34 +01: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
a91c74d794
Merge pull request #6309 from quadshot/before-oi-meta
...
filter for adding info before order item itemmeta in order metabox
2014-09-22 10:36:48 +01: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
0f8c8886e0
adding the after
...
loushou
2014-09-19 08:34:34 -07:00
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
Nicola Mustone
46689ce083
Fixing order notes date
2014-09-19 09:55:16 +02:00
Loushou
f17bb56891
filter to allow custom 'add line' buttons
...
loushou
2014-09-18 09:05:42 -07:00
Loushou
f0c4b80113
filter for adding info before order item itemmeta in order metabox
...
loushou
2014-09-18 08:55:13 -07:00
Loushou
76f3049751
adding a method to allow default billing information in order metabox
...
loushou
2014-09-18 08:33:49 -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
8e35bbf0ba
Clear transients for new parent when saving a grouped product. Closes #6278
2014-09-17 14:18:43 +01:00
Mike Jolley
5343833427
Fix - Saving of variation stock when parent stock management is disabled.
2014-09-10 21:03:37 +01:00
Mike Jolley
1d13f767b3
Merge pull request #6157 from tamarazuk/coding-standards
...
Coding standards Part 1
2014-09-03 17:05:42 +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
Tamara Zuk
fc0e7adacb
Coding Standards: Admin - Meta boxes
...
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability
@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 03:18:21 -04: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
justinstern
8417209d6c
Improve, fix, WC_Payment_Gateway::get_transaction_url()
...
* Make the new get_transaction_url() method a bit more
flexible/convenient by passing in the full order object rather than
transaction_id
* Fix bug with core PayPal gateway get_transaction_url() override
2014-08-27 21:51:03 -04:00
Barry Kooij
94365791af
Changed all use of get_product to wc_get_product
2014-08-19 12:09:29 +02:00
claudiosmweb
6081f3b61f
fixed some missing and wrong textdomains
2014-08-15 16:08:43 -03:00
Mike Jolley
575ba5974e
Variation level backorder 'parent' option makes no sense now parent backorder select is hidden
...
#6035
2014-08-15 15:29:14 +01:00
Barry Kooij
6655188f0b
Changed use of get_order with wc_get_order
2014-08-15 14:29:21 +02:00
Mike Jolley
3f53512c7f
Fix up visibility of stock options, drop downs, and get_availability() when parent is managing stock for a variation.
...
Fixes #6017
2014-08-13 15:03:30 +01:00
Mike Jolley
dfe30bfe84
Tweak max spend text for #5992
2014-08-13 11:43:28 +01:00
Mike Jolley
dc60cea213
Merge pull request #5992 from adamawesomeface/master
...
maximum ammount for coupon functionality added
2014-08-13 11:41:33 +01:00
Mike Jolley
9084ae222f
Remove unused/uncoded options from dev branch
...
Fixes #6004
2014-08-13 11:38:49 +01:00
Mike Jolley
5bc293a69c
Initial display of add order item buttons Fixes #5991
...
Also Closes #5994
2014-08-12 12:54:44 +01:00
adamawesomeface
0e22412a7d
maximum ammount for coupon functionality added
2014-08-08 07:38:58 -04:00
Gustavo Bordoni
7d4a6fc7d8
Merge branch 'master' into issue/5875
...
Conflicts:
assets/css/admin.css
2014-08-05 01:21:48 -03:00