raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-07 03:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,130 Commits 18 Branches 455 Tags
477ca39e58f07df3438592fcba7863e4bb80dfc4
Commit Graph

15325 Commits

Author SHA1 Message Date
Maikel Linke
f83e78a5b8 Clarify adjustment data only for display 
We are not creating a new adjustment here.
 2023-10-12 15:16:38 +11:00
Maikel Linke
74c8f06e80 Simplify helper with extracted method 2023-10-12 14:17:41 +11:00
Gaetan Craig-Riou
8d639c14cb Add a fake adjustment voucher tax on admin order page 
When tax are included in price, voucher tax is stored in the voucher
adjustment and not as its own adjustment. So we add a "fake adjustment"
for display purposes.
 2023-10-02 15:58:12 +11:00
Gaetan Craig-Riou
8254bd9625 Take into account voucher tax part when displaying tax included in price 2023-10-02 15:58:12 +11:00
Konrad
8150a8b04a Merge pull request #11579 from macanudo527/remove_delegate_belongs_to 
Remove Deprecated delegate_belongs_to
 2023-10-01 13:19:22 +02:00
Konrad
33d9ed4000 Merge pull request #11591 from dacook/admin-users-api-key-9833 
Redirect to admin users edit path on success
 2023-10-01 12:20:46 +02:00
Konrad
06ebeeac0f Merge pull request #11543 from rioug/11364-Voucher-fix-tax-report 
[Vouchers] Fix Sales Tax Totals By Order report
 2023-10-01 02:09:33 +02:00
David Cook
e844d71abc Redirect to edit path on success 
Simply rendering the edit form on the posted path is problematic. For example if you refresh the path you get a 404.
But if there's errors, we want to render the form with unsaved values so you can see the errors and try again.
 2023-09-28 09:41:44 +10:00
David Cook
91b251acd4 Refactor 2023-09-26 10:56:44 +10:00
Neal Chambers
50eb8f31f2 Remove Deprecated delegate_belongs_to 2023-09-26 09:50:08 +09:00
Gaetan Craig-Riou
02aaf6f692 Remove voucher validation on code format 
The code doesn't rely on label match any more so this restriction
is not necessary anymore
 2023-09-25 09:49:55 +02:00
Gaetan Craig-Riou
097b775fa0 Add metadata before saving adjustment 
Rails may put it all in one transaction

Co-authored-by: Maikel <maikel@email.org.au>
 2023-09-25 17:44:16 +10:00
Jean-Baptiste Bellet
c134de850c Add filter on completed_at of an order 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
4f332504af Add new line at the end of file 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
9e295146cb Remove supplier filter 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
baff4b5399 Rename 'distributor' to 'hub' 2023-09-22 16:44:33 +01:00
Gaetan Craig-Riou
03ce39d5c5 Add metadata to tax related voucher adjustment 
In the scenario where you have tax excluded from price, when adding
a voucher to an order, we create 2 voucher adjusments. One of them
represent the tax part of the voucher, and has a label starting with
"Tax". To better differentiate them and allow a reliable way to
query it, we add a metadata entry.
 2023-09-22 11:16:21 +02:00
Rachel Arnould
a3ca7e9032 Merge pull request #11568 from jibees/11069-buu-fully-update-the-details-of-my-products-and-variants-1 
🚧 [BUU] Add `Edit` link into a small menu on the last Actions column to the right of the table
 2023-09-22 10:30:01 +02:00
Gaetan Craig-Riou
3197480121 Prevent voucher from starting with "Tax" 
Plus spec
 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
bec5ad55dd Use VoucherAdjustmentsService to retrieve tax part of the voucher 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
7c34145ed7 Add voucher_included_tax and voucher_excluded_tax 
It retrieves the tax part of the voucher adjustment for tax included
in price and tax excluded from price respectively.
 2023-09-22 10:17:40 +02:00
Gaetan Craig-Riou
b620e413f4 Merge pull request #11378 from mkllnk/dfc-ofn-product-group-id 
[DFC API] Add custom OFN product id to DFC SuppliedProduct
 2023-09-22 17:57:11 +10:00
Jean-Baptiste Bellet
458a031558 Create a private function for event listener 2023-09-22 09:30:40 +02:00
Konrad
a55797d727 Merge pull request #11510 from rioug/11421-deactivate-voucher 
[Vouchers] add activate/deactivate feature
 2023-09-21 15:03:47 +02:00
Konrad
1e877f4183 Merge pull request #11555 from mkllnk/spree-orders 
Remove duplicate association from Spree::User
 2023-09-21 13:23:51 +02:00
Maikel Linke
6386a997d3 Compare adjustments in deterministic order for invoices 
The comparator would sometimes compare two different adjustments when it
should have compared two versions of the same adjustment.
 2023-09-21 16:37:07 +10:00
Maikel Linke
02f251c900 Import DFC SuppliedProduct as new variant of existing product 2023-09-21 09:04:57 +10:00
Rachel Arnould
15137caed2 Merge pull request #11509 from dacook/buu-editing-part3-11059 
[BUU] Bulk form editing features
 2023-09-20 19:27:05 +02:00
Jean-Baptiste Bellet
2a98789571 Add vertical-ellipsis-menu as product/variant actions menu in products table 
+ add specs
 2023-09-19 16:08:27 +02:00
Jean-Baptiste Bellet
c76bc07f7f Creates a vertical-ellipsis-menu component 2023-09-19 15:32:50 +02:00
Jean-Baptiste Bellet
2c478f1d8e Link to product/variant edit page 2023-09-19 14:26:14 +02:00
Jean-Baptiste Bellet
0847f6b0f6 Create a new column actions for each rows (product+variant) 2023-09-19 14:25:55 +02:00
Maikel Linke
4ebfe73f60 Remove duplicate association 
Probably a relict from a Spree upgrade.
 2023-09-18 12:38:01 +10:00
Gaetan Craig-Riou
776f478038 Make update the only public method 
I think this got lost when refactoring, but only `update` is meant
to be a public method, other than `new`.
 2023-09-15 11:42:04 +02:00
Jean-Baptiste Bellet
02bbd9a9ba Adjust colors and height for sidebar-item component 2023-09-15 11:05:59 +02:00
Jean-Baptiste Bellet
657f4d95d7 move sidebar-item into admin v3 context 2023-09-15 11:02:45 +02:00
Jean-Baptiste Bellet
fe81900639 Update select2.scss 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
10b6df6bd7 Tweak dashboard for a hub manager 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
7326241c70 Move pages/changetypeform to admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
ae04063643 Create and adjust big button 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
4aaf0ddc18 Move dashboard-single-ent into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
a59c8adbbf Adjust color for edit action to $teal 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
241dbd1ded move plugins/powertip into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
62465b9bbc Move components/actions into admin_v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
dfe79396f6 Use $teal color for some info in the order page 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
f71ace1d39 Move sections/orders scss file into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
f110c55531 Add product_import into admin_v3 context and adjust some colors 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
8ae68b15a0 Adjust select2 multiple choices colors 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
beba709827 Move buttons/input stuff into related file 
And adjust design for v3 style
 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
371e064f82 Adjust padding left right size for text-angular component in v3 context 2023-09-15 10:47:44 +02:00