luisramos0
86f9b3d663
Delete product_distributions: drop table and remove models, controllers and BO edit page
2019-03-13 11:47:50 +00:00
Kristina Lim
8782f2087c
Use service in admin/payments#create
...
This separates logic for bang and non-bang versions of
Spree::Order#next.
The different conditions used in both methods (state == "completed" vs
order.completed?) have implications in whether a transition is attempted
or not.
2019-03-13 17:00:31 +11:00
Kristina Lim
0e691815ea
Use service in admin/orders/customer_details#update
2019-03-13 12:45:57 +08:00
Kristina Lim
abaf90fc41
Copy more actions advancing order from Spree
...
This copies the following:
* admin/orders/customer_details#update
* admin/payments#create
2019-03-13 12:45:57 +08:00
Kristina Lim
7a8bf76123
Move transitioning of order in admin/orders#edit to service
2019-03-13 12:45:50 +08:00
luisramos0
77655bfffb
Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu
...
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
2019-03-12 19:11:37 +00:00
Kristina Lim
ce5691d080
Copy admin/orders#edit from Spree controller
...
This method needs to be updated to use custom order advance logic in
service.
2019-03-12 18:31:27 +08:00
Pau Perez
bbfd35c861
Fix CacheSettingsController violations
2019-03-06 10:45:45 +01:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
3ddee83be5
Merge pull request #3404 from luisramos0/2-0-disable-cache
...
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
luisramos0
a0594f7616
Re-add invoice settings controller removed by mistake
2019-02-26 14:14:17 +00:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat
aed9c41b0d
Merge pull request #3394 from mkllnk/3021-update-soft-delete
...
[Spree upgrade] 3021 update soft delete
2019-02-25 11:58:41 +01:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
Matt-Yorkley
f73221ed85
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-02-20 13:10:47 +00:00
Maikel Linke
99f0be2f1c
Remove unnecessary scope Variant.not_deleted
...
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.
Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
Maikel Linke
cdb49f88b0
Move Variant deletion into its own service
...
This keeps the override of Spree's model leaner. More importantly, it
prepares us for using `destroy` instead of `delete`.
In the past, `Product#delete` soft-deleted the product, but didn't
delete the variants. When we use `Product#destroy` to soft-delete the
product, it will also call destroy on the variants. If the model doesn't
allow the deletion of the last variant, it will fail. So when a product
is deleted we want to allow the deletion of all variants. But the user
should not be allowed to delete the last variant. That's why I'm moving
the check to the controller level.
Related commits:
- e6c7acdff32b47c9145ab9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)
2019-02-19 14:25:18 +11:00
Maikel Linke
8f49f0006a
Update products controller decorator with Spree
...
Spree changed the controller to deal with the updated soft-delete. This
commit brings these changes to our decorator.
2019-02-19 14:25:18 +11:00
Maikel Linke
5d828bd7ae
Update soft-delete of products
...
Spree changed their way of soft-deleting products, variants and
some other models. `#destroy` is now soft-deleting and replaces
`#delete`.
This commit considers only products. Variants will follow in another
commit. The other models can be ignored, because we don't call `delete`
on them.
2019-02-19 14:25:18 +11:00
Maikel
1b45033e33
Merge pull request #3506 from Matt-Yorkley/pi/parse_bom
...
Sanitize non-parsable BOM characters inserted by Excel
2019-02-19 11:24:11 +11:00
Maikel
b7abb72ed5
Merge pull request #3462 from luisramos0/delete-api-order-ctrl
...
Delete empty controller class eval and spec
2019-02-19 11:14:29 +11:00
Matt-Yorkley
9705c249ac
Sanitize no-parsable BOM characters inserted by Excel
2019-02-18 13:13:37 +00:00
Maikel
d4589cc2f4
Merge pull request #3444 from mkllnk/3437-supplier-name-on-invoice
...
3437 supplier name on invoice
2019-02-15 16:31:29 +11:00
Pau Pérez Fabregat
fce92090db
Merge pull request #3479 from luisramos0/2-0-stable-Feb12
...
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)
2019-02-14 09:40:28 +01:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
luisramos0
58ea28ebb4
Make Api::ShipmentsController#create re-use order.shipment if it exists
...
Improve code and add specs to this controller
2019-02-12 10:09:00 +00:00
luisramos0
77b390a836
Decorate spree api shipments controller to scope variants as they are added/removed from shipments
2019-02-12 10:09:00 +00:00
luisramos0
0f44beb477
Delete all Spree::Admin::LineItemsController customizations as they are no longer used
2019-02-12 10:09:00 +00:00
luisramos0
ad0e5bb093
Re implement orders ctrl update method so we can change redirection logic and add specs for it
2019-02-10 15:31:01 +00:00
Kristina Lim
c81be75530
Move engine libraries except Engine and Version to services
2019-02-08 21:26:38 +00:00
Kristina Lim
3f84d0008a
Move some in OpenFoodNetwork to engine services
...
This removes the OpenFoodNetwork namespace from these too.
2019-02-08 21:26:38 +00:00
Kristina Lim
95e3a2f45d
Move authorization to the ::Parameters class
2019-02-08 21:26:38 +00:00
Kristina Lim
9e035efd50
Render enterprise fee report directly in renderer
2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a
Separate enterprise fee summary action
...
Split the previous "index" action into "new" and "create" actions.
2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131
Rename EnterpriseFeeSummaryReportController
...
Remove "Report" because this is redundant, and pluralize the resource
name.
2019-02-08 21:26:38 +00:00
Kristina Lim
552bf1b9f7
Move report list to own class
2019-02-08 21:26:38 +00:00
Kristina Lim
edf0b0df76
Add navigation item for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
d3e9a53120
Filter enterprise fee summary for user permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a
Authorize filters before generating enterprise fee report
2019-02-08 21:26:37 +00:00
Kristina Lim
cd3e258b59
Rename report authorizers to reflect permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
7d74ddc85b
Add HTML view for enterprise fee summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
34dc16f8c9
Base filter options from initial authorizer object
2019-02-08 21:26:37 +00:00
Kristina Lim
bd2b4c0134
Add enterprise fee summary form without options
...
The objects will be filled in another commit. This simply sets up the
filters UI for now.
2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f
Add basic action for enterprise fee summary
2019-02-08 21:26:37 +00:00
luisramos0
3dc75c88d2
Delete empty controller class eval and spec. Useless left overs from 0ad2978926
2019-02-08 09:29:58 +00:00
luisramos0
1b4666fc6a
Add checkbox to cache settings to disable products cache
2019-02-07 20:06:27 +00:00
Pau Pérez Fabregat
676fa3d84d
Merge pull request #3433 from Matt-Yorkley/bi/user_permission
...
Update cancan permissions for second iteration of bulk invoices
2019-02-07 20:17:34 +01:00
Luis Ramos
2d0df7ffdf
Update app/controllers/spree/admin/orders_controller_decorator.rb
...
Co-Authored-By: mkllnk <maikel@email.org.au >
2019-02-07 09:19:19 +11:00
Matt-Yorkley
2c3eeec2b9
Update cancan permissions for second iteration of bulk invoices
2019-02-06 18:19:53 +00:00
