David Cook
9bef8b74f8
Merge pull request #11401 from jibees/some-buu-design-updates
...
🚧 BUU: some design updates + one small code fix
2023-08-16 11:41:33 +10:00
Maikel
fd7b00ac7f
Merge pull request #11323 from mkllnk/dfc-import-context
...
Use known, statically cached DFC context
2023-08-16 11:35:57 +10:00
Matt-Yorkley
70ba027603
Merge pull request #11221 from Matt-Yorkley/product-shipping-category
...
[Product Refactor] Shipping Category
2023-08-15 11:12:56 +01:00
David Cook
f4a6bec25d
Code fix
...
Cache result.
2023-08-15 08:36:50 +02:00
Jean-Baptiste Bellet
200550588a
Be as clause as possible from native <select />
...
Still need to wrap/ellipsis selected item...
2023-08-15 08:36:50 +02:00
Jean-Baptiste Bellet
0c11ea5868
Use tom-select to have a designed dropdown
...
Not sure this is the best solution, since it's not exactly the right usage of tom-select
2023-08-15 08:36:50 +02:00
Jean-Baptiste Bellet
6fe069608c
Re-adjust tom-select to match admin v3 style
2023-08-15 08:36:50 +02:00
Jean-Baptiste Bellet
223d350b43
Use grid instead of flex in order to be more fixed and less flexible ;)
2023-08-15 08:36:50 +02:00
Jean-Baptiste Bellet
2814368670
Adjust inside container to content without any padding
2023-08-15 08:36:50 +02:00
jibees
364ae5c0c6
Merge pull request #11404 from rioug/11402-invoice-data-generator-fix-flacky-test
...
Invoice data generator, fix flaky test
2023-08-15 08:34:53 +02:00
Gaetan Craig-Riou
5a2155aeb7
Use the same sorting when choosing a line item to update
...
The presenter uses order.sorted_line_items, so use the same method
when picking up the line item to update.
2023-08-15 11:33:02 +10:00
David Cook
2196cd5be8
Merge pull request #11381 from openfoodfoundation/release_v4.4.7
...
Update translations for release v4.4.7
2023-08-15 10:21:34 +10:00
David Cook
8b666c67d6
Fix typo
...
🤦 Always, always preview changes before committing.
2023-08-15 09:54:42 +10:00
David Cook
54328d7b98
Mention browser limitations
2023-08-15 09:53:39 +10:00
Matt-Yorkley
75f246109f
Fix assignment of default shipping category in variant new/edit pages
2023-08-14 21:02:48 +01:00
Matt-Yorkley
811a8cde7f
Use optional: false instead of validates: presence
2023-08-14 21:02:48 +01:00
Matt-Yorkley
97d9aadb69
Update specs
2023-08-14 21:02:48 +01:00
Matt-Yorkley
dea2adc3d6
Update EntryValidator
2023-08-14 21:02:48 +01:00
Matt-Yorkley
42d04b6581
Update OrderAvailableShippingMethods service
2023-08-14 21:02:47 +01:00
Matt-Yorkley
a712eac333
Update shipping_category in /lib and /engines
2023-08-14 21:02:47 +01:00
Matt-Yorkley
5e0e60dfd6
Update reports
2023-08-14 21:02:47 +01:00
Matt-Yorkley
724c08c94d
Set default shipping_category if absent
2023-08-14 21:02:47 +01:00
Matt-Yorkley
c18c525d9f
Save shipping category selection to new variant when creating a new product
2023-08-14 21:02:47 +01:00
Matt-Yorkley
e3c488306c
Migrate data for shipping_category_id
2023-08-14 21:02:47 +01:00
Matt-Yorkley
eefc356472
Update shipping_category usage in admin pages
2023-08-14 21:02:47 +01:00
Matt-Yorkley
0c634cf04f
Update shipping_category permitted attributes
2023-08-14 21:02:47 +01:00
Matt-Yorkley
57d6fa006c
Update shipping_category association in models
2023-08-14 21:02:47 +01:00
Matt-Yorkley
e2caebc374
Add shipping_category to variants table
2023-08-14 21:00:02 +01:00
Konrad
99daab07b7
Merge pull request #11297 from mkllnk/require-belongs-to--part2
...
Require belongs_to associations by default
2023-08-12 17:09:03 +02:00
Matt-Yorkley
613802f477
Update stage.yml
2023-08-11 13:50:34 +01:00
Matt-Yorkley
99907dc3a6
Update stage.yml
2023-08-11 13:48:31 +01:00
Matt-Yorkley
7084d0cb40
Update stage.yml
2023-08-11 13:44:38 +01:00
Matt-Yorkley
e33b0af6fe
Update stage.yml
2023-08-11 13:42:14 +01:00
Matt-Yorkley
6dfeecead1
Update stage.yml
2023-08-11 13:30:35 +01:00
Rachel Arnould
5afe45d922
Merge pull request #11382 from jibees/11273-buu-remove-new_products_page-feature-toggle
...
🔧 Remove `new_products_page` and all associated controllers/components/...
2023-08-11 11:43:49 +02:00
David Cook
5a96f285c1
Update release title
2023-08-11 16:24:11 +10:00
David Cook
1a58914e43
Categories release notes by dependencies label
...
https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
2023-08-11 16:13:22 +10:00
Gaetan Craig-Riou
61e6d55872
Merge pull request #10821 from rioug/10727-vouchers-percentage-rate
...
[Vouchers] Percentage rate
2023-08-11 16:06:09 +10:00
Gaetan Craig-Riou
a2def2424c
Add a comment around the use of safe_constantize
...
It triggers a Brakeman error that can be safely ignored
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
9c9a6234e1
Per review, clean up voucher specs
...
Add explicit 'order.item_total' to make specs more readable
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
054eac0822
Use a better describe
...
Co-authored-by: David Cook <david@redcliffs.net >
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
e6b53c0a42
Per review , Simplify creation of Voucher
...
We now check against known type to instanciate the correct voucher
instead of using a case
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
3f63cfbc27
Fix Rubocop warning
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
e8b374d0f2
Remove left over comment
2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
2828bd098d
Refactor VoucherAdjustment service
...
We are taking advantage of having a FlatRate and a PercentageRate
model to simplify the code a little
2023-08-11 15:41:34 +10:00
Gaetan Craig-Riou
29a38467d2
Fix admin pages to work with refactored vouchers
2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
46e04ca7ee
Refactor voucher: 3 percentage rate voucher
2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
def594ab81
Refactor voucher: 2 FlatRate voucher
2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
204f3933d0
Refactor voucher: 1 base voucher class
...
Refactor voucher to use a single table inheritance. It will simplify the
code and remove a bunch of conditional
2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
959e2308dd
Add system specs for percentage based voucher
...
Similar to tax included in price scenario, adds a test for percentage
based voucher to check the adjustments are recalculated when needed.
Plus fix tax incluced in price specs to use new factory
2023-08-11 14:51:36 +10:00
