raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

1108 Commits

Author SHA1 Message Date
Matt-Yorkley
3946e7a6f5 Memoize presenters in OrderInvoiceComparator 
This is now twice as fast and triggers half the number of database queries if both comparison methods get called
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
352ad20681 Fix display_checkout_taxes_hash in invoice_table4 template 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0ed7599267 extract methods related to invoices from the order model to the OrderInvoiceComparator 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
61d58df56f fix linter issues 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d86173c509 add feature toggle 
seperate the invoice templates that rely on presenters from the old ones.
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fa14dc370b implement the invoice data generator 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d9efd10ac0 update attributes relevant for the comparaison 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0fbf88190e Generate invoice model 
There are three main components:
1. The invoice model
2. order serializers: serialize the order for the invoice
3. data presenters: the object that will be use to access the order's serialize data
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
1daab8994d Remove is_master and not_master scopes 2023-06-16 21:23:44 +01:00
Matt-Yorkley
618900767f Fix flaky spec: use milliseconds in cache service and remove sleep 2023-06-16 21:23:44 +01:00
Matt-Yorkley
3ef7d2c9ff Remove master variant from product 2023-06-16 21:23:44 +01:00
Matt-Yorkley
7dc1091bc2 Migrate product image from master variant to product 2023-06-16 21:23:44 +01:00
Matt-Yorkley
6fa381197a Don't tax fees before payment state 2023-06-14 10:19:30 +01:00
Matt-Yorkley
a0f23fc510 Extract before_payment_state? method 2023-06-14 10:19:30 +01:00
Mohamed ABDELLANI
c2aaf88e98 remove checkout controller 2023-06-13 14:58:16 +01:00
Matt-Yorkley
abd55b2104 Move order to completed whether it's current state is payment or confirmation 2023-06-13 10:14:09 +01:00
Matt-Yorkley
47df9493ae Fix ProcessPaymentIntent service 2023-06-13 10:14:09 +01:00
Gaetan Craig-Riou
41b3ddae08 Merge pull request #10714 from macanudo527/fix_linelength 
Fix Style/LineLength
 2023-06-12 09:53:23 +10:00
Neal Chambers
252697b782 Rewrite If and Unless Statements to be more Readable 2023-06-09 16:39:26 +09:00
Filipe
ca03e1596b Merge pull request #10952 from Matt-Yorkley/full-name 
Improve nil-safety in variant naming methods
 2023-06-08 16:26:28 +01:00
Matt-Yorkley
f3ee10dd5a Simplify by moving conditional to guard clause 2023-06-07 13:01:37 +01:00
Matt-Yorkley
bb73d70e57 Improve nil-safety in variant naming methods 2023-06-07 12:17:50 +01:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Filipe
2ba0f635f2 Merge pull request #10860 from Matt-Yorkley/order-cycle-deleting 
Delete exchange variants in bulk when deleting an order cycle
 2023-06-01 13:49:32 +01:00
Matt-Yorkley
e99c328643 Update app/services/variant_units/variant_and_line_item_naming.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-01 10:12:19 +01:00
Matt-Yorkley
7f5d1be792 Guard against unsaved variant's product in OptionValueNamer for product import 2023-06-01 10:12:19 +01:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Matt-Yorkley
35b41fc7fe Persist unit_value on variant and "option value text" on variant and line_item and improve related AR callbacks 2023-06-01 10:12:19 +01:00
Matt-Yorkley
896e4c45f2 Clarify confusing class 2023-06-01 10:11:20 +01:00
Matt-Yorkley
e5eb622ac7 Cut dead code 2023-06-01 10:11:20 +01:00
Jean-Baptiste Bellet
6b29f7e3c5 Sanitize content with a new TrixScrubber 
specifically made for trix editor with its allowed tags
 2023-05-26 15:19:27 +02:00
Matt-Yorkley
2373d044f7 Update app/services/orders_bulk_cancel_service.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-05-26 10:33:23 +01:00
Jean-Baptiste Bellet
925b0e0308 Add a form in admin to create/update a custom tab for an enterprise 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
0d98ec8f4c In admin, add form to set hide_groups_tab attribute 
+ add specs
 2023-05-22 10:29:56 +02:00
Matt-Yorkley
5930d0c1f5 Make bulk actions more generic 2023-05-21 00:15:32 +01:00
Matt-Yorkley
55d9deb5bd Update order cancelling bulk action 2023-05-21 00:15:32 +01:00
Matt-Yorkley
61849d84e7 Extract order capturing to OrderCaptureService 2023-05-21 00:15:32 +01:00
Matt-Yorkley
048df6230b Remove angular from admin orders index page 2023-05-21 00:15:32 +01:00
Matt-Yorkley
a8559e621f Simplify exchange variant callback and prefer delete over destroy 
Delete is faster than destroy but should only be used if the object has no callbacks or touches.
 2023-05-19 11:26:33 +01:00
Maikel
f943b411c5 Merge pull request #10823 from abdellani/fix-file-name-used-as-parameter 
[Security] Validate product import file path
 2023-05-19 14:28:09 +10:00
David Cook
360a241402 Style fix 2023-05-18 10:07:52 +10:00
Matt-Yorkley
e1b0a03819 Scope orders before bulk actions 2023-05-17 12:03:40 +02:00
Mohamed ABDELLANI
fcb8550cb1 extract file path sanitizer to an independent class 2023-05-17 15:09:48 +10:00
Gaetan Craig-Riou
17e32a89f8 Add VoucherAdjustmentsService to handle calculation 
Refactor Voucher to move voucher adjustments calculation
to VoucherAdjustmentsService
 2023-05-15 13:42:39 +10:00
David Cook
a170b93cc1 Simplify further 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-05-05 15:34:23 +10:00
Matt-Yorkley
dfc651ed2c Convert Permissions::Order#visible_line_items to a relation with or query 
This change looks innocuous but the result of converting this into a nice relation instead of two queries stuck together with the pipe operator (|) can make a huge difference when chaining this into subqueries. The result set is ultimately the same, but the queries can be built without first returning all the ids and then sticking those ids in an array.
 2023-04-28 19:13:22 +01:00
Gaetan Craig-Riou
152af5e105 Merge pull request #10751 from mkllnk/mail-config 
Remove unused feature to intercept emails
 2023-04-28 16:28:41 +10:00
Jean-Baptiste Bellet
35778ecf1d If enterprise has a white_label_logo attached, then can edit its link 2023-04-26 11:04:47 +02:00
Maikel Linke
dae8703b02 Remove unused feature to intercept emails 
This option came from Spree and we never used it. The config input field
is disabled in the admin interface and I checked our managed databases.

I don't think that we will want this feature in the future either.
Staging sends unmodified emails which is more realistic and we haven't
had a use case to intercept those emails. There's still the BCC option
if we need additional access.
 2023-04-26 13:50:31 +10:00
Jean-Baptiste Bellet
e3001cc8c4 Add white_label_logo to enterprise model as attachment 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-20 08:45:03 +02:00