raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,829 Commits 16 Branches 456 Tags
f858fe3c685352f3f53bdf16e203114ebbda780c
Commit Graph

18829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
f858fe3c68 Improve coverage in admin_orders_controller_spec 2021-02-19 11:18:00 +00:00
Matt-Yorkley
cc55e9eeda Improve coverage in orders_controller_spec 2021-02-19 11:17:59 +00:00
Matt-Yorkley
d4750b9f26 Improve clarity of orders controller test 2021-02-19 11:17:59 +00:00
Matt-Yorkley
ba81bd8395 Remove after_action callback in Admin:OrdersController 2021-02-19 11:17:59 +00:00
Matt-Yorkley
5c5d687c9b Remove hacks for working around closed adjustments 
The enterprise fees are recreated and the shipping and payment fees are updated. The rest of the deleted code is not necessary (eg #with_open_adjustments). Everything else that needs to happen here is already done automatically (eg updating order totals).
 2021-02-19 11:17:59 +00:00
Matt-Yorkley
9303d61db1 Update specs 2021-02-19 11:17:58 +00:00
Matt-Yorkley
8466ab5675 Extract more OFN fee-handling code from Spree::Order class 2021-01-29 22:51:21 +00:00
Matt-Yorkley
793baca44f Update fees on single line item and then order fees in LineItemsController#delete 
Fees on other line items are left alone (not recreated), and whatever fees on the order are updated.
 2021-01-29 21:53:11 +00:00
Matt-Yorkley
ce5f9a9a94 Update existing closed order fees when deleting line items on completed orders in LineItemsController#delete 
Whatever fee adjustments there are on other line items should be left alone (not recreated), and whatever fee adjustments are already on the order should just be updated.
 2021-01-29 21:53:11 +00:00
Matt-Yorkley
58c7c90624 Refactor methods for updating closed adjustments 2021-01-29 21:53:11 +00:00
Matt-Yorkley
b2b6d3ab87 Relocate specs for #provided_by_order_cycle? method extracted from Order class to service 2021-01-29 21:53:11 +00:00
Matt-Yorkley
dffa4d4f39 Update order methods delegation 2021-01-29 21:53:09 +00:00
Matt-Yorkley
3ecdfca9cf Rename fee adjustment clear-all method 2021-01-29 21:52:28 +00:00
Matt-Yorkley
9abf6cdcdf Rename expensive method Order#update_distribution_charge! 
This method is named "update distribution charge". What this method actually does is delete all of the fee adjustments on an order and all it's line items, then recreate them all from scratch. We call this from lots of different places all the time, and it's incredibly expensive. It even gets called from inside of transactions being run inside callbacks. Renaming it hopefully will add a bit of clarity.

This needs to be a lot more granular!
 2021-01-29 21:52:28 +00:00
Matt-Yorkley
785cdf9bdc Extract order fees logic to service 2021-01-29 21:52:27 +00:00
Matt-Yorkley
e7866db7b1 Improve efficiency in applying enterprise fees in Order#update_distribution_charge! 2021-01-29 18:32:26 +00:00
Matt-Yorkley
c65f623ed8 Memoize and simplify objects being checked in Order#provided_by_order_cycle? 2021-01-28 01:02:57 +00:00
Maikel
8a757812e7 Merge pull request #6735 from coopdevs/enable-mail-delivery-always 
Enable mail delivery always
 2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3 Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments 
Delete dead code Spree::Order#price_adjustments
 2021-01-27 23:29:38 +01:00
Pau Pérez Fabregat
c3897dd3df Merge pull request #6643 from coopdevs/customer-balance-frontoffice 
Customer balance frontoffice
 2021-01-27 19:55:56 +01:00
Matt-Yorkley
7525620d6c Merge pull request #6070 from Matt-Yorkley/responsive-admin 
Full-width admin layout
 2021-01-27 12:45:06 +01:00
Matt-Yorkley
feca9e7838 Improve hubs sidebar in payment methods edit 2021-01-27 11:38:01 +00:00
Matt-Yorkley
398b4a09a1 Improve enterprise fees calculator fields 2021-01-27 11:38:01 +00:00
Matt-Yorkley
366588de95 Improve <legend> element centering 2021-01-27 11:38:01 +00:00
Matt-Yorkley
b5ab6cbf69 Improve button spacing in enterprises submenu 2021-01-27 11:38:01 +00:00
Matt-Yorkley
e762c1d02f Adjust buttons layout on enterprise shipping and payment methods page 2021-01-27 11:38:01 +00:00
Matt-Yorkley
f72cd6222f Adjust variant columns in inventory pages 2021-01-27 11:38:01 +00:00
Matt-Yorkley
79316560d6 Remove skeleton.css from /vendor/assets 
This was recently imported from spree_core
 2021-01-27 11:38:01 +00:00
Matt-Yorkley
539ff228e0 Adjust form layout on order cycle edit form (simple view) 2021-01-27 11:38:01 +00:00
Matt-Yorkley
afdb5e8c6f Add a max-width of 1400px for huge monitors (1600px or more) 2021-01-27 11:38:01 +00:00
Matt-Yorkley
d40ec2d63c Adjust order cycle edit form layout 2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b Adjust dashboard layout 2021-01-27 11:38:01 +00:00
Matt-Yorkley
52cfa0a103 Remove old Javascript hacks for the main menu and replace with flex-based CSS properties 2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea Tweak some styles and layout classes 2021-01-27 11:38:01 +00:00
Matt-Yorkley
29e74017a6 Replace fixed 960 grid 2021-01-27 11:38:01 +00:00
Pau Pérez Fabregat
9fe2cb1a30 Merge pull request #6681 from luisramos0/css 
[Rails 5] Make the app work in rails 5
 2021-01-27 12:08:27 +01:00
Maikel Linke
0393e902c4 Update translations from Transifex 2021-01-27 08:28:37 +11:00
Pau Pérez Fabregat
10a60b1f72 Merge pull request #6729 from openfoodfoundation/dependabot/bundler/shoulda-matchers-4.5.1 
Bump shoulda-matchers from 4.5.0 to 4.5.1
 2021-01-25 16:34:13 +01:00
Pau Perez
5677c86f9b Remove enable_mail_delivery preference from DB 
It's no longer used.
 2021-01-25 13:34:13 +01:00
Pau Perez
4a5869b60c Remove ability to toggle mail delivery 
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
 2021-01-25 13:27:44 +01:00
Pau Pérez Fabregat
efd2c81877 Merge pull request #6722 from luisramos0/spree_routes 
Replace spree_get with simple get
 2021-01-25 09:12:51 +01:00
dependabot[bot]
70bd81430d Bump shoulda-matchers from 4.5.0 to 4.5.1 
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-25 06:13:04 +00:00
Matt-Yorkley
0247386f82 Delete dead code Spree::Order#price_adjustments 
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
 2021-01-23 00:05:56 +00:00
Luis Ramos
1643636d43 Replace spree_get with simple call to get 2021-01-22 22:32:48 +00:00
Luis Ramos
d6a53cb84f Replace spree_get with simple call to get 2021-01-22 22:30:11 +00:00
Luis Ramos
94275eedfb Replace spree_get with simple call to get 2021-01-22 22:28:53 +00:00
Luis Ramos
59e900826e Replace spree_get with get 
Spree helper method is not needed
 2021-01-22 22:22:50 +00:00
Luis Ramos
be9ee376a3 Use get instead of spree_get 
spree_get is not needed in these cases
 2021-01-22 22:20:52 +00:00
Maikel Linke
7add9247d5 Update translations from Transifex 2021-01-22 11:58:27 +11:00
Maikel
d5376ce29d Merge pull request #6702 from openfoodfoundation/transifex 
Transifex
 2021-01-22 11:54:57 +11:00