raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

1645 Commits

Author SHA1 Message Date
cyrillefr
6666896fa3 Requested changes 2025-04-02 14:46:22 +02:00
cyrillefr
f0a5c76b45 Fixes button staying disabled after report fail 
- added a test
 2025-04-01 17:25:53 +02:00
David Cook
4402854a2a AddEnableProducersToEditOrdersToEnterprises 
With system spec for setting the preference. The enterprise edit page seems under-tested..
 2025-03-31 16:16:27 +11:00
Maikel Linke
ca9f32ceae [API change] Remove unused Product#on_hand 2025-03-28 14:48:40 +11:00
Maikel Linke
e35a29cc29 Remember local stock of backordered products 
When retail variants are mapped to wholesale variants, we usually have a
some leftover stock at the end of an order cycle. For example, we
backordered a slab of 12 cans of tomatoes but our customers bought only
9 of those. Then we have 3 left for the next order cycle.

Even when the product is not available for backorder with the supplier,
we still want to sell off our leftover stock, the three cans of tomatoes
in our example.

And it might be that the product will come back in the future.
 2025-03-27 13:36:48 +11:00
Maikel Linke
c60718feea List absent products in import preview 2025-03-27 13:36:48 +11:00
Maikel Linke
a6c08fe2ad Reset stock for absent products in DFC catalog 2025-03-27 13:36:47 +11:00
Gaetan Craig-Riou
d8f2bb09d0 Re enable assertion 
It's working fine with the current design
 2025-03-26 12:50:42 +11:00
Gaetan Craig-Riou
1ee3e9a2a1 Add proper fee testing 
The previous version wasn't testing anything as there was no fees set
up.
Now we check that fees are applied as expected, and also that supplier
fees are applied only to the expected product.
 2025-03-26 12:50:35 +11:00
Maikel Linke
9d5ce0ede5 Remove surrounding whitespace from pasted DFC URL 2025-03-03 12:23:58 +11:00
Maikel Linke
b6153fc155 Rescue from invalid DFC catalog URLs 
This mistake should be dealt with differently but I wanted to make sure
that a really invalid URL is handled well, too.
 2025-03-03 12:23:58 +11:00
Filipe
cf3213cf96 Merge pull request #13168 from dacook/dfc-product-import-select-all-12301 
[DFC Orders] Select/deselect all on DFC Product Import
 2025-02-27 16:43:37 -06:00
David Cook
5a1d6b749e Fix spec 
The label got changed in a separate PR that was merged around the same time.
It's my fault for changing the label.
 2025-02-26 15:57:12 +11:00
Maikel
462886447a Merge pull request #13126 from mkllnk/oidc-error 
Direct people to refresh OIDC connection when needed
 2025-02-24 15:45:48 +11:00
Filipe
f715c366ea Merge pull request #13160 from chahmedejaz/task/13097-add-columns-in-packing-reports 
Add shipping method and shipment state to packing reports
 2025-02-20 19:49:03 -06:00
David Cook
c2e54104d0 Add select/deselect all checkbox 
There's A Controller For That.
(But I think it makes the HTML ugly..)
 2025-02-20 10:56:53 +11:00
David Cook
96b8a4c068 Merge pull request #13134 from dacook/fix-locale-12301 
Update label and change default dev locale
 2025-02-19 09:38:14 +11:00
Ahmed Ejaz
1611b2a31f Add shipping method and shipment state to packing reports 2025-02-18 12:42:34 +05:00
Maikel Linke
ffe4084b7f Link to OIDC settings from error message 
The colour of the link is really bad though.
 2025-02-18 12:15:13 +11:00
Maikel Linke
bb503e12a3 Direct people to refresh OIDC connection 
Not the best UX but the easiest next step to implement. Next we should:

* Include link in error message instead of redirecting straight there.
  Otherwise users may feel disoriented.
* Provide a custom error message?
 2025-02-18 12:14:12 +11:00
Filipe
e7ef5984d5 Merge pull request #13125 from dacook/dfc-product-import-list-12301 
[DFC Orders] List products to import on screen
 2025-02-13 22:34:32 -06:00
cyrillefr
2bc5ed49e6 Changes in spec 
Due to the splitting of products_v3_spec in 4 parts.
 2025-02-12 16:01:21 +01:00
cyrillefr
6d6164c8f6 Keep stock selection when error on saving 
- added 2 not to be persisted attributes aimed at dealing with the UI
- added them to the permitted list
- updated view to switch mode about on_hand/on_demand
  that is: from an already persisted variant or not
    - Not persisted deals with on_*_desired not to be persisted fields
    - Persisted mode deals with regular on_* fields
- the corresponding spec for both on_hand/on_demand
 2025-02-12 16:01:21 +01:00
David Cook
2d577e9e46 Merge pull request #13136 from mkllnk/flaky-oc-spec 
Hopefully fix flaky OC spec
 2025-02-12 14:29:43 +11:00
Maikel Linke
5e1690f736 Restore missed expectation 
A previous pull request re-wrote this spec but omitted the main
expectation of this spec block.

* https://github.com/openfoodfoundation/openfoodnetwork/pull/11852/files
 2025-02-10 16:49:11 +11:00
Maikel Linke
1e1754db4b Hopefully fix flaky OC spec 
I couldn't reproduce this reliably but I found the loading of AngularJS
components a bit slow sometimes. So this is just a guess.
 2025-02-10 16:45:33 +11:00
Maikel Linke
ecd873be59 Fix flaky payment method spec 
This didn't come up on CI because CI is probably waiting long enough for
the flash to disappear. But locally it failed every time for me.
 2025-02-10 16:12:37 +11:00
David Cook
bbc7f21ecd Rename field label 
This could have been done in Transifex, but I figured it would be quicker to just go ahead and update here.
 2025-02-10 14:11:03 +11:00
David Cook
9f7000009d Only import selected products 2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd Show list of products to import 
If there's a matching product in OFN already, a link will appear.
 2025-02-06 16:28:15 +11:00
Ahmed Ejaz
5dddf8b69a fix specs 2025-01-31 17:34:34 +05:00
Ahmed Ejaz
393154bae3 13013: fix specs 2025-01-31 17:34:34 +05:00
Filipe
32c4b4557b Merge pull request #13086 from rioug/fix-tax-rate-refund 
Remove tax rate refund code path
 2025-01-30 21:54:30 -06:00
Filipe
e2161660b3 Merge pull request #13090 from mkllnk/replace-spree-roles 
Replace spree roles
 2025-01-30 21:30:56 -06:00
Gaetan Craig-Riou
be78c2ac41 Fix system admin adjustment spec 2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
cd7e92c6ca Fix various spec 2025-01-27 11:02:41 +11:00
Gaetan Craig-Riou
d4a060c6a2 Fix Zone system spec 2025-01-27 11:01:07 +11:00
Konrad
01036e6321 Merge pull request #13087 from mkllnk/stock-location 
Remove class Spree::StockLocation
 2025-01-25 12:41:37 +01:00
David Cook
09fe6d7542 Merge pull request #13091 from mkllnk/flaky-ship 
Fix flaky spec of order shipment
 2025-01-24 15:02:19 +11:00
Filipe
5d360730c7 Merge pull request #13023 from rioug/12907-fix-checkout-shipping-fee 
[Checkout] Shipping fees update, remove order callback
 2025-01-23 18:50:31 -06:00
Maikel Linke
c975a2c8c4 Fix flaky spec of order shipment 
I found that a delay in the reflex handling the request could fail the
spec. Added a sleep in the reflex to reproduce the fail. The I added
expectations for the page content to wait until the page was updated and
that fixed the specs.
 2025-01-22 15:34:09 +11:00
Maikel Linke
d49cea5e3d Use admin flag instead of user role 2025-01-22 14:59:49 +11:00
Maikel Linke
70ebe7b964 Remove stock location from specs 2025-01-22 11:52:25 +11:00
Maikel Linke
68a0f8df1f Remove detour via StockLocation updating stock 2025-01-22 11:20:04 +11:00
Maikel Linke
917e0ff01a Remove unnecessary storage of currency 2025-01-21 20:11:05 +01:00
Maikel
229ee7028c Merge pull request #13064 from mkllnk/negative-stock 
Don't show stock for on-demand inventory items
 2025-01-21 11:05:50 +11:00
Gaetan Craig-Riou
1afa7fe5c0 Per review, small improvment 2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
a8d1d0c591 Update spec to properly update line items on an order 
User Order::Contents#update_item to update line item on an order, it
ensures the order is properly updated
 2025-01-15 15:44:24 -06:00
François Turbelin
96c7c828c1 Fix specs 2025-01-13 16:54:17 +01:00
François Turbelin
9c153c6083 Improve specs 2025-01-13 16:54:17 +01:00