Maikel Linke
d4512904ea
Make product order deterministic
...
When products are sorted by name and two products have the same name,
their order is undefined. With pagination, two pages can have a
different order of products with the same name which then means that two
pages can return the same product.
Sorting by product id makes sure that the result is always in the same
order, for every page.
2019-12-05 15:37:10 +11:00
Luis Ramos
e0e833b2f3
Merge pull request #4454 from luisramos0/sort_products
...
Sort products alphabetically in OC edit page
2019-11-27 22:27:42 +00:00
Luis Ramos
7cc034c2bc
Merge pull request #4136 from mkllnk/4018-synchronise-checkout
...
Lock variants during checkout to avoid race condition
2019-11-27 15:40:28 +00:00
luisramos0
15bcde36cb
Remove order by filter on outgoing exchanges list of products
...
The products are now coming from the server already sorted
2019-11-26 17:59:30 +00:00
Matt-Yorkley
ff076fd7be
Eager-load option_values in Api::ProductsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
d30192207b
Eager-load option_values in ProducerMailer
2019-11-23 10:58:18 +01:00
Matt-Yorkley
19afc1a6da
Eager-load option_values in Api::VariantsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
4ef682915c
Eager-load option_values in Admin::EnterprisesController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
e693e8ac37
Eager-load option_values in Admin::BulkLineItemsController
2019-11-23 10:58:18 +01:00
luisramos0
e2087bcc8c
Bring return authorizations view from spree_backend
2019-11-22 13:39:36 +00:00
luisramos0
b066b87141
Bring return authorizations controller from spree_backend
2019-11-22 13:39:04 +00:00
Luis Ramos
008921c201
Merge pull request #4447 from luisramos0/clickable_steps
...
Clickable steps on the OC edit page
2019-11-20 21:16:07 +00:00
Luis Ramos
0882887abe
Merge pull request #4452 from luisramos0/ready_for
...
Make "Ready for" field show a red border when added to the list of outgoing exchanges
2019-11-20 21:14:25 +00:00
Luis Ramos
0eb4574b37
Merge pull request #4422 from luisramos0/the_poc
...
New Order Cycles edit page with steps
2019-11-20 21:11:23 +00:00
Maikel Linke
50093c325a
Move checkout locking to its own service
...
It gives this complex logic more space and allows for better structure
and more comments at the right places.
2019-11-19 18:18:01 +11:00
Maikel Linke
df2306cf82
Lock variants during checkout to avoid race condition
...
It was possible that several people bought the same variant even though
there wasn't enough stock for everybody. That resulted in negative
stock.
2019-11-19 18:18:01 +11:00
Luis Ramos
2b37592280
Merge pull request #4449 from luisramos0/properties
...
Move properties and product properties from spree_backend to OFN
2019-11-15 08:57:32 +00:00
Luis Ramos
471ec2023e
Merge pull request #4426 from Matt-Yorkley/customer_totals
...
Orders and Fulfilment reports
2019-11-14 12:07:16 +00:00
luisramos0
f1c055805f
Use $timeout instead of setTimeout which makes it possible to remove apply()
2019-11-12 12:06:44 +00:00
luisramos0
5cadb0d16f
Make ready for field show with red borders immediatly after exchange is added to the list
2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e
Make view a bit simpler by removing unnecessary string interpolation
2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395
Make OC edit page steps clickable when editing an OC
2019-11-12 12:05:40 +00:00
luisramos0
6e51be095b
Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically
2019-11-12 12:04:42 +00:00
luisramos0
1c7237869a
Refactor products_scope to make it more simple
2019-11-12 12:04:42 +00:00
luisramos0
14433e7764
Fix some rubocop issues in admin/order_cycles_controller
2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43
Make simple create redirect to OC list but normal create to jump to incoming settings
2019-11-12 12:00:48 +00:00
luisramos0
7c63e59ae9
Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs
2019-11-12 12:00:48 +00:00
luisramos0
43cf249184
Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings
2019-11-12 12:00:48 +00:00
luisramos0
537dbd3dc0
Fix angular specs by moving specs to the same place as the code was moved previously
...
Quite a few copy pasted specs were also removed
2019-11-12 12:00:48 +00:00
luisramos0
7c54781d90
Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages
2019-11-12 12:00:48 +00:00
luisramos0
3b4241c70d
Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers
2019-11-12 12:00:48 +00:00
luisramos0
a290e83501
Move more copy pasted code to basic OC controller
2019-11-12 12:00:48 +00:00
luisramos0
6e0019227b
Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers
2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb
Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl
...
Same for AdminOrderCycleOutgoingCtrl
2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a
Fix the simple edit OC and the new OC page flows
2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125
Adapted navigation between OC edit pages by adding new previous and next buttons
2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409
Add wizard to OC new and edit pages
2019-11-12 12:00:48 +00:00
luisramos0
683232dd10
Improve page titles and fix broken translation
2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226
Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page
2019-11-12 12:00:48 +00:00
Matt-Yorkley
a1146aed1b
Refactor #sort_by_supplier_id
2019-11-12 11:59:39 +00:00
Matt-Yorkley
e73f2d682c
Remove N+1 in editable_variants_for_incoming_exchanges
2019-11-12 11:59:13 +00:00
Matt-Yorkley
170bc94d92
Refactor order_cycle_serializer
2019-11-12 11:59:13 +00:00
Matt-Yorkley
5082a133a1
Refactor adjustment fetching into new service and module
2019-11-12 11:57:54 +00:00
Pau Pérez Fabregat
ed15bc422e
Merge pull request #4453 from luisramos0/rubo
...
run rubocop --auto-correct
2019-11-12 10:30:21 +01:00
Luis Ramos
3e318e5c4e
Merge pull request #4425 from Matt-Yorkley/admin_eager_loading
...
Eager-load variant associations in admin ProductsController
2019-11-11 15:29:45 +00:00
Luis Ramos
3eb4caeb3e
Merge pull request #4408 from luisramos0/poc_oc
...
Remove dead code from OC edit page code
2019-11-11 14:55:37 +00:00
luisramos0
553d4ebaa0
Fix a few rubocop issues in reports code
2019-11-10 19:27:41 +00:00
luisramos0
73ee14cc7c
Fix long line in injection helper
2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19
Fix a few more rubocop issues manually
2019-11-10 19:14:12 +00:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
