wandji20
4d222c61c6
Improve readability of order_cycle_set process method
2024-08-22 22:17:12 +01:00
wandji20
d599cf77a2
Fix failing specs
2024-08-22 22:17:12 +01:00
wandji20
8f7505d53d
Refactor oc datetime content partial and include warning modal in oc list [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
867e17301f
Support passing oc confirmation params for oc list [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
95135ca526
Move order_cycle datetime verification logic to service files [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
de063fecb1
Move same_datetime_value method to OrderCycle model [OFN-12775]
2024-08-22 22:17:12 +01:00
Filipe
ef9ca33913
Merge pull request #12772 from drummer83/E500_sub
...
Display admin order page instead of shopfront order page to avoid error 500
2024-08-22 13:26:20 -06:00
Konrad
2710eafc33
Merge pull request #12779 from EdwardLi-coder/clearer_error_message_and_clean_up
...
Clearer error message and clean up for Product Categories
2024-08-22 18:15:50 +02:00
Joseph Johansen
4718fdb0be
Optimise Spree::Taxon.supplied_taxons
2024-08-22 17:41:00 +02:00
Joseph Johansen
ce6ae04147
Add spec for confirming correct values when scoped
2024-08-22 17:41:00 +02:00
johansenja
1621f97fdb
Use subject method in spec
...
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com >
2024-08-22 17:41:00 +02:00
Joseph Johansen
96f9894f41
Add enterprise_ids to cache key
2024-08-22 17:41:00 +02:00
Joseph Johansen
66b519bd1c
Undo minor unneeded changes
2024-08-22 17:41:00 +02:00
Joseph Johansen
1b8e256e8a
Add unit tests
2024-08-22 17:41:00 +02:00
Joseph Johansen
b73e529bfc
Scope injected enterprise properties to specific enterprises
2024-08-22 17:41:00 +02:00
Konrad
25b1620707
Merge pull request #12743 from wandji20/wb-OFN-12214
...
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
2024-08-22 17:34:20 +02:00
Joseph Johansen
5f9b14df9f
Implement rake task to combine results
2024-08-21 13:02:31 +01:00
Joseph Johansen
922b853e3a
Define specs for rake task to combine results
2024-08-21 13:02:31 +01:00
Joseph Johansen
8d747a2508
Enable coverage in base_spec_helper
2024-08-21 13:02:31 +01:00
Gaetan Craig-Riou
ef6e37e7ca
Fix suppliers_of_products_distributed_by
...
Plus spec
Left over from product refactor, it was missed because it's not covered
by unit or integration test
2024-08-21 13:05:34 +10:00
Gaetan Craig-Riou
a50be52cde
Merge pull request #12792 from openfoodfoundation/dependabot/npm_and_yarn/elliptic-6.5.7
...
Bump elliptic from 6.5.4 to 6.5.7
2024-08-21 09:56:19 +10:00
Gaetan Craig-Riou
d62d002bc5
Merge pull request #12780 from dacook/optimise-12714
...
Optimise subscriptions admin
2024-08-21 09:50:27 +10:00
Gaetan Craig-Riou
ffc2fed9b5
Remove unused code
2024-08-20 16:43:22 +10:00
Maikel
0c7448ba43
Merge pull request #12726 from mkllnk/order-stock-spec
...
Track (negative) stock for on-demand products and overrides
2024-08-20 15:05:16 +10:00
Gaetan Craig-Riou
24afd40414
Fix bulk coop supplier report
2024-08-20 14:32:35 +10:00
Maikel
524aec7868
Merge pull request #12788 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-1.0.2
...
Bump mrujs from 1.0.1 to 1.0.2
2024-08-20 14:30:47 +10:00
David Cook
f2eb4b05f4
Avoid copying gigantic array
2024-08-20 14:00:13 +10:00
David Cook
ffaf1b4ea0
Cache distributor
2024-08-20 14:00:13 +10:00
David Cook
eb547f4861
Add test on number of db queries
...
Hmm, I think I seen an opportunity to clean up already.
2024-08-20 14:00:13 +10:00
David Cook
c9daca22d5
Rename spec to match class name
2024-08-20 14:00:13 +10:00
dependabot[bot]
7b22740289
Bump elliptic from 6.5.4 to 6.5.7
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.4 to 6.5.7.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7 )
---
updated-dependencies:
- dependency-name: elliptic
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-08-20 03:52:13 +00:00
Maikel
66c8a5c424
Merge pull request #12789 from chahmedejaz/bugfix/12783-fix-artifact-upload-names-conflict
...
Fix Artifact Upload Conflicts with Unique Node-Based Names
2024-08-20 13:51:13 +10:00
David Cook
cfeac651b6
Merge pull request #12785 from filipefurtad0/spec_for_#12768
...
Reproduces S2 bug #12768
2024-08-20 13:45:07 +10:00
EdwardLi-coder
05315ff8e0
delete spree.new_taxon
2024-08-20 08:11:49 +08:00
EdwardLi-coder
c4ee6b14ff
clear error message and clean up
2024-08-20 08:11:49 +08:00
filipefurtad0
a78f46259c
Asserts on the flash warning first
...
The warning first displays "Saving..." before confirming changes are saved.
I'm not entirelly sure, but it seems that asserting on this first, before asserting on other page elements stabilizes the spec.
2024-08-19 13:58:03 -06:00
filipefurtad0
1e79fde236
Reproduces S2 bug #12768
2024-08-19 13:58:03 -06:00
Ahmed Ejaz
a9fe52a4ff
Revert "12783 - validate artifact upload"
...
This reverts commit 075f5499f8
2024-08-19 23:29:12 +05:00
Ahmed Ejaz
075f5499f8
12783 - validate artifact upload
2024-08-19 23:16:39 +05:00
Ahmed Ejaz
ed61f7e7bc
12783: use unique artifact name based on node index
2024-08-19 22:57:04 +05:00
dependabot[bot]
bd6019036e
Bump mrujs from 1.0.1 to 1.0.2
...
Bumps [mrujs](https://github.com/KonnorRogers/mrujs ) from 1.0.1 to 1.0.2.
- [Changelog](https://github.com/KonnorRogers/mrujs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/KonnorRogers/mrujs/compare/v1.0.1...v1.0.2 )
---
updated-dependencies:
- dependency-name: mrujs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-08-19 09:31:52 +00:00
Konrad
0bbc3d2758
Merge pull request #12766 from mkllnk/magick-dep
...
Remove direct dependency on MiniMagick
2024-08-18 18:39:48 +02:00
Konrad
ae6182579b
Merge pull request #12762 from EdwardLi-coder/change_colour_of_complete_order
...
change colour of "complete order"
2024-08-18 15:08:46 +02:00
Konrad
1e05811917
Merge pull request #12745 from johansenja/optimise-shops-page5
...
Improve effiency of OrderCycle.earliest_closing_times
2024-08-18 14:40:49 +02:00
Konrad
5f86a26f42
Merge pull request #12733 from wandji20/wb-OFN-6567
...
Update product variant unit display name, price, and total price width on different screen sizes [OFN-6567]
2024-08-18 13:25:24 +02:00
Konrad
3f1b907ef2
Merge pull request #12740 from wandji20/wb-OFN-12532-v1
...
Pluralize admin products search result [OFN-12532-v1]
2024-08-18 12:18:18 +02:00
Cillian O'Ruanaidh
08ab405893
Rename method for looking up trix attribute or action by translation key
2024-08-16 17:02:03 +01:00
Cillian O'Ruanaidh
ae2e92f09d
Don't need to set value on hidden fields for Trix editors, it will be set automatically
2024-08-16 16:20:53 +01:00
Cillian O'Ruanaidh
b174080e29
Fix Layout/LineLength Rubocop violation in spec/system/admin/enterprises_spec.rb
2024-08-16 16:08:41 +01:00
Cillian O'Ruanaidh
a2c3ac2f60
Fix expected placeholder in test after updating translation
2024-08-16 16:00:08 +01:00
