Jean-Baptiste Bellet
131772f7b2
Variant can be "not available": next and don't update its estimate price
2023-03-03 15:07:10 +01:00
Jean-Baptiste Bellet
440e776e3a
fee_calculator can be retrieved outside subscription_line_items iteration
2023-03-03 15:05:07 +01:00
Cillian O'Ruanaidh
855ec1a708
Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods
2022-09-30 13:13:39 +01:00
georgethoppil
a37f54e4b3
Find subscriptions in schedule to recalculate nil estimate price
2022-05-17 20:58:25 -04:00
georgethoppil
86a3f91ca2
When order cycle open/close times are updated, check to see if any subscription has line items that have price estimate as nil. Recalculate the price and save the column
2022-05-11 13:54:43 -04:00
Monica Sirathanarun
ebaf96ddae
Add test and change order_cycle#show to redirect to edit page.
2021-10-19 23:20:54 +07:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Nihal Mohammed
18282a6f73
Add advanced settings button to incoming and outgoing pages in OC cycle edit
2021-06-30 09:50:38 -07:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Matt-Yorkley
4c2871e572
Refactor and fix params issues in Admin::OrderCyclesController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
bd408e02b0
Update OrderCyclesController params usage
2021-03-11 12:19:55 +00:00
Matt-Yorkley
dcecfaea87
Fix params issues in OrderCyclescontroller spec
2021-03-11 12:19:54 +00:00
Luis Ramos
96a351ad0e
Adapt usage of Sets to their new location
2021-01-14 09:41:07 +00:00
Luis Ramos
0fb9f44dda
Make all controllers use new Admin::ResourceController
2020-12-03 15:32:20 -08:00
Matt-Yorkley
aaf7a90f8b
Convert OrderCycleNotificationJob to ActiveJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
787f29105c
Fix ForbiddenAttribute errors for bulk update of enterprise fees and order cycles
...
Example error:
As an administrator
I want to manage simple order cycles
updating many order cycle opening/closing times at once
Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s
ActiveModel::ForbiddenAttributesError:
{"order_cycle_set"=>{"collection_attributes"=>{"0"=>{"id"=>62, "name"=>"Updated Order Cycle 1", "orders_open_at"=>"2040-12-01 12:00:00", "orders_close_at"=>"2040-12-01 12:00:01"}, "1"=>{"id"=>63, "name"=>"Updated Order Cycle 2", "orders_open_at"=>"2040-12-01 12:00:02", "orders_close_at"=>"2040-12-01 12:00:03"}, "2"=>{"id"=>64, "name"=>"Updated Order Cycle 3", "orders_open_at"=>"2040-12-01 12:00:04", "orders_close_at"=>"2040-12-01 12:00:05"}}}, "controller"=>"admin/order_cycles", "action"=>"bulk_update", "format"=>"json", "order_cycle"=>{}}
# ./app/controllers/application_controller.rb:20:in `print_params'
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# ActiveModel::ForbiddenAttributesError:
# ActiveModel::ForbiddenAttributesError
# ./app/models/model_set.rb:29:in `block in collection_attributes='
2020-11-17 18:51:48 +00:00
Matt-Yorkley
2eda8789d1
Add user id logging to OrderCycle an Schedule PaperTrail entries
2020-08-15 14:49:08 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
fd2cf7295e
Extract permitted_attributes from order_cycle_controller into a specific service
2020-03-21 16:17:20 +00:00
Luis Ramos
57f8fa26ab
Fix strong params in order_cycles
2020-03-21 14:45:51 +00:00
Luis Ramos
1a46e7b7ee
Improve strong params implementation on order_cycle controller and fix corresponding specs
2020-03-21 14:45:51 +00:00
Luis Ramos
905811ccb3
Handle strong params in admin order_cycles controller
2020-03-21 14:45:51 +00:00
Luis Ramos
29377bbff9
Move 5 subscriptions services from app/services to the engines/order_management/app/services
2020-03-16 17:20:01 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +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
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
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Maikel
eb9064f5be
Merge pull request #2383 from frank-west-iii/issue-2271-prepend-load
...
Fix NoMethodError in order cycles index
2018-06-27 09:12:18 +10:00
Rob Harrington
cf9f8edcce
Allow html requests for OrderCycleController#update
...
This is still used from the Advanced Settings page, to update the order_cycle
2018-06-22 09:46:08 +10:00
Rob Harrington
25525ae30b
Move applicator calls to OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
d9830749f1
Extract schedule syncing logic into OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
ab9c06837b
Add basic OrderCycleForm to handle create/update logic
2018-06-22 09:46:08 +10:00
Rob Harrington
3f5b6be5b6
Remove unnecessary respond_to blocks from OrderCyclesController
2018-06-22 09:46:08 +10:00
Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Frank West
f2e1caabff
Fix NoMethodError in order cycles index
...
When a user's session has timed out and they try to load new data on the
order cycles page by changing filters, the application throws a
`NoMethodError` because we are prepending the load data method before
checking the user's session.
We can fix this by removing the prepend on this action.
2018-06-18 06:36:55 -07:00
Pau Pérez Fabregat
1abfe2ab8c
Merge pull request #2199 from coopdevs/auto-correct-cops
...
Auto correct cops
2018-04-16 14:58:28 +02:00
Pau Perez
746fcd5802
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
2018-04-09 18:47:17 +02:00
Rob Harrington
ce56e667a4
Use union operator instead of concatenate to load order cycle collection
2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956
Return an error if no order_cycle_set params are submitted to #bulk_update action
2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d
Refactor loading of OrderCycleSet in OrderCyclesController
...
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
2018-04-04 17:17:36 +10:00
Rob Harrington
672f96b85b
Replace references to 'standing order' with 'subscription'
2018-02-09 14:44:13 +11:00
Rob Harrington
03f1980b1b
Auto-correct rubocop offences for standing-orders
2018-02-09 14:44:07 +11:00
