luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Matt-Yorkley
d48774e3a2
Add comment
2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974
Fix checkbox values on orders page
2018-12-10 20:48:53 +00:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
47d51ca525
Prefer guard clause in updateCountOnHand for VOs
2018-12-05 17:40:31 +08:00
Kristina Lim
34c34b94d1
Describe method countOnHandPlaceholder for VOs
2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7
Make VO count on hand readonly unless limited stock
2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5
Ensure in UI compatible VO count and on demand
2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c
Translate variant override on_demand yes and no
2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Pau Pérez Fabregat
869f17256d
Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee
...
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-27 17:28:43 +01:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Pau Perez
23bda74ecb
Match name of filter and db column for consistency
2018-11-15 19:09:17 +01:00
Pau Perez
a4bbe2b696
Query completed_at filtering orders by date range
2018-11-15 19:09:17 +01:00
Pau Perez
b1b04b505e
Fetch orders sorted by completion date
2018-11-15 15:40:13 +01:00
Pau Perez
e69d297f86
Wrap long and unreadable lines
2018-11-15 14:26:13 +01:00
Hugo Daniel
7b33712f7a
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-15 14:05:08 +01:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Pau Perez
51155bb368
Remove old commented out code
...
You know, git already keeps old code for us.
2018-11-06 14:23:15 +00:00
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
2018-11-02 16:57:28 +11:00
Pau Pérez Fabregat
8e602d453b
Merge pull request #2876 from luisramos0/subs-states-fix
...
Fix bug in subscriptions address controller where country states were not correctly returned
2018-10-30 17:32:34 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
luisramos0
c9784a5eda
Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront
2018-10-23 17:53:08 +01:00
luisramos0
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
luisramos0
fe9f4a1c95
Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead
2018-10-17 12:16:33 +01:00
luisramos0
c281927372
Fix subscription address form. It now clears the state selection when a different country is selected
2018-10-16 23:02:26 +01:00
luisramos0
1804bf5a2b
Extract countryStates logic from customer_address modal and re-use new CountryStates service
2018-10-16 22:45:38 +01:00
luisramos0
5c5a2194d6
Extract country states logic out of subscriptions address controller into new service CountryStates
2018-10-16 21:58:27 +01:00
luisramos0
feaf16d878
Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases
2018-10-16 20:59:34 +01:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
85962158b8
Merge pull request #2821 from nikobozi/oc-clear-filter
...
Make 'Clear All' button work on order cycle page
2018-10-09 16:35:57 +02:00
niko
f99ed81863
Make 'Clear All' button work on order cycle page
2018-10-04 11:46:38 +02:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Maikel
ce7be68fac
Merge pull request #2660 from kristinalim/translations-failed_oc_creation
...
Translate and fix fallback errors when creating or updating OC
2018-09-14 16:58:39 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
