Maikel
1df3a6bb66
Merge pull request #13049 from mkllnk/dfc-wholesale-stock
...
Calculate stock from DFC wholesale variants
2025-01-08 12:32:44 +11:00
Konrad
8e0c0392d9
Merge pull request #12991 from murjax/remove-sku-11973
...
Remove product SKU from product pages and report
2025-01-07 21:14:39 +01:00
Konrad
428eb465c0
Merge pull request #13009 from MrBowmanXD/dev
...
Added the :selected option with the default tax category #12989
2025-01-07 20:04:28 +01:00
Maikel Linke
ddaeff7c53
Use DfcCatalog in offer broker
2025-01-07 11:03:34 +11:00
David Cook
a89d65cfc7
Merge pull request #13057 from mkllnk/remove-local-storage
...
Remove local storage
2025-01-06 11:45:27 +11:00
Gaetan Craig-Riou
ab57618e59
Merge pull request #13044 from mkllnk/dfc-store-order-links-only
...
Remove old, replaced backorder lookup
2025-01-06 10:11:34 +11:00
kernal053
bad32e226e
Fix label for other adjustments and add spec correspodingly
2025-01-02 16:29:48 +01:00
Maikel Linke
be98544537
Remove unused AngularJS service KeyValueMapStore
2025-01-02 15:19:55 +11:00
David Cook
7f3b1c0d7a
Merge pull request #13029 from mkllnk/flaky-order-cycle-spec
...
Add timepicker helper with added expectation to reduce flakiness
2025-01-02 13:45:28 +11:00
Filipe
5fdd0e5d42
Merge pull request #12954 from rioug/fix-shipment-not-updated
...
Ensure shipment gets updated when an order is updated
2024-12-26 15:56:12 -06:00
Filipe
e2e2285f81
Merge pull request #13027 from chahmedejaz/bugfix/13026-reset-variant-unit-name
...
Changing a variant unit scale from items to weight/volume does not remove variant unit name
2024-12-19 18:27:39 -06:00
Maikel Linke
c1f8d3035a
Sleep after selecting time for stability
2024-12-20 11:15:49 +11:00
Maikel Linke
f74492190d
Select time like the user does
...
It makes it easier to understand. It didn't improve stability.
2024-12-20 11:15:49 +11:00
Maikel Linke
874c464088
Tidy one spec example
2024-12-20 11:15:49 +11:00
Maikel Linke
72376da98f
Assess stability without retry
2024-12-19 16:29:33 +11:00
Maikel Linke
a30f764a22
Add timepicker helper with added expectation
2024-12-19 16:29:33 +11:00
Maikel Linke
60b62d41d6
Remove old, replaced backorder lookup
2024-12-17 13:48:03 +11:00
David Cook
e689844a0f
Merge pull request #13033 from mkllnk/dfc-pricing
...
DFC Orders: Calculate wholesale price for imported retail variants
2024-12-16 15:37:30 +11:00
Gaetan Craig-Riou
ad7ba3e680
Use the correct spanish translation for Unit Scale
2024-12-16 11:25:23 +11:00
Filipe
9bfac66412
Merge pull request #13012 from chahmedejaz/task/13007-customer-code-in-order-cycle-email
...
Add customer code to notify producer emails when enabled
2024-12-13 10:50:02 -06:00
Maikel Linke
13e008e91e
Calculate wholesale price for imported retail variants
2024-12-12 16:08:45 +11:00
Maikel Linke
d5c3e94b24
OfferBroker needs only catalog URL, no other URLs
2024-12-12 15:45:42 +11:00
Maikel Linke
9b965f657c
Use OIDC account factory
2024-12-12 15:22:35 +11:00
Maikel Linke
bf41658d32
Fix nil error when amending backorder
2024-12-11 12:40:46 +11:00
Maikel Linke
fcbaefb2c8
Update each backorder only once in bulk cancel
2024-12-11 12:40:46 +11:00
Maikel Linke
e76d6ad3df
Spec current order cancellation amending backorder
...
The cancellation happens async in Javascript. Therefore we need to wait
for and outcome on the page to know that the action finished. The
expectation needs to be around that whole block.
We actually want only one job enqueued if the same backorder is
affected. Time to fix that.
2024-12-11 12:40:46 +11:00
Maikel Linke
e1febc6e00
Simplify page actions
2024-12-11 12:40:46 +11:00
Maikel Linke
7d27f46d68
Simplify negated expectation
2024-12-11 12:40:46 +11:00
Maikel Linke
7d7253cf0e
Re-use BackorderUpdater to complete backorder
2024-12-11 12:40:46 +11:00
Maikel Linke
4fa4eb1b4e
Move backorder update code to re-usable class
2024-12-11 12:40:46 +11:00
Maikel Linke
d16cd8c84e
Amend backorder completely
...
Update every single order line to reflect local orders and stock levels.
New cases supported:
* Add lines for orders created by an admin.
* Create backorder line after increase of local line item quantity.
* Adjust local stock after variant has been removed from order cycle.
2024-12-11 12:40:46 +11:00
Ahmed Ejaz
3e031ab735
13026: reset variant unit name if unit is not items
2024-12-11 03:14:11 +05:00
Ahmed Ejaz
604a47bd96
13007: add specs for text mail
2024-12-10 05:49:35 +05:00
Ahmed Ejaz
bb70d21a35
13007: add specs
2024-12-10 05:34:32 +05:00
Filipe
7ca5927411
Merge pull request #12996 from chahmedejaz/bugfix/12993-fix-order-cycle-report-text-version
...
Order cycle mail reports to producers display different data in html and txt versions
2024-12-09 16:32:46 -06:00
Filipe
6e40e4da60
Merge pull request #13018 from chahmedejaz/task/13008-add-tax-category-in-all-products-report
...
Add 'tax category' to the All Products report
2024-12-09 16:21:01 -06:00
Manuel Gonçalves
0d4904d9e4
Small change in spec file
2024-12-09 09:07:22 +00:00
Manuel Gonçalves
5def2b53e5
Added a spec file in order to test the tax categories helper
2024-12-08 10:52:14 +00:00
Ahmed Ejaz
93a3130851
12973: add specs
2024-12-05 16:18:21 -06:00
Gaetan Craig-Riou
cedf040b47
Per review, test on create and update
2024-12-04 22:15:56 +11:00
Gaetan Craig-Riou
4a6e4d4c6d
Ensure shipment is updated when using update_or_create
...
`Spree::OrderContents#update_or_create` is used to update the cart when
on the /shop page. If you start an order and proceed to the "Order
summary" step, and then decide to update your order by using the shop
link next to the cart, such update wouldn't update the shipment.
This result in the order page in the backoffice displaying the wrong data,
and more importantly, in the stock not being updated.
So now we ensure shipment will be updated, which result in the checkout
flow being restarted, thus making sure the shipment is updated.
2024-12-04 16:30:45 +11:00
Maikel
4c71ea3866
Merge pull request #12994 from mkllnk/dfc-update-voc
...
Add new DFC vocabulary for order states
2024-12-04 12:57:03 +11:00
Ahmed Ejaz
c331d57cdb
13008: add tax category in all products report
2024-12-04 03:36:42 +05:00
Maikel
de938f6f10
Merge pull request #12949 from rioug/12859-use-VINE-voucher
...
[City OFN Voucher] A shopper can use a VINE voucher
2024-12-03 14:04:44 +11:00
Maikel
697f430156
Merge pull request #12992 from mkllnk/errors
...
Add simpler Alert.raise interface to notify Bugsnag
2024-12-03 13:29:11 +11:00
Ahmed Ejaz
af200ab4a0
12993: fix lint issues
2024-12-02 18:40:18 +05:00
Ahmed Ejaz
bbdee7c0f3
12993: add included tax in text report
2024-12-02 18:04:18 +05:00
Maikel Linke
c4c95d472e
Use defined DFC orders states
2024-11-29 16:16:42 +11:00
Maikel Linke
e791184468
Remove failing map spec
...
I couldn't fix it easily. But I also think that the testing approach had
low value here.
It raised:
```
Failures:
1) Map map can load does not show alert
Failure/Error:
assert_raises(Capybara::ModalNotFound) do
accept_alert { visit '/map' }
end
Minitest::Assertion:
Capybara::ModalNotFound expected but nothing was raised.
[Screenshot Image]: /home/runner/work/openfoodnetwork/openfoodnetwork/tmp/capybara/screenshots/failures_r_spec_example_groups_map_map_can_load_does_not_show_alert_64.png
# ./spec/system/consumer/map_spec.rb:11:in `block (3 levels) in <top (required)>'
# ./spec/system/support/cuprite_setup.rb:39:in `block (2 levels) in <top (required)>'
# ./spec/base_spec_helper.rb:153:in `block (3 levels) in <main>'
# ./spec/base_spec_helper.rb:153:in `block (2 levels) in <main>'
```
2024-11-29 13:46:01 +11:00
Filipe
355c9686e3
Merge pull request #12963 from murjax/map-network-check-8230
...
Show alert if map cannot load
2024-11-28 12:26:22 -06:00
