raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-25 05:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,960 Commits 15 Branches 458 Tags
0887f0676f97c7393c0dd6ebf8a17d4bccc22fce
Commit Graph

30960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaetan Craig-Riou
751056ba39 As per review comment, spell out voucher code when entering a voucher 
Plus, update other related spec to be consistent
 2023-07-14 14:47:39 +10:00
Gaetan Craig-Riou
789ce39ff4 Fixing Rubocop errors 2023-07-14 14:47:39 +10:00
Gaetan Craig-Riou
a8062e951a Add a scenario to make sure voucher adjustment a recalculated 
This is specificly for voucher with a tax component, but it will
also become relevant for percentage based voucher.
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
edabc56b5c Add voucher calculation after updating an order 
This is to make sure the voucher are recalculated when a customer
update the order content from the `/cart` page. This is tested
with system test
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
ca7dcb82b8 Apply voucher after transitionning to the confirmation step 
Testing that VoucherAdjustmentsService.calculate has been called after a
transition doens't work, skipping test for now.
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
366cca7984 Prevent voucher adjustment from bein updated when update is called 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
87790b29ae Fix VoucherAdjustmentsService.calculate so we can call it mutiple time 
It now uses `order.pre_discount_total` to make any calculation, that
means you can call it multiple time and you will still get the same
adjustment amount, included_tax and tax adjustment when needed. This
is assuming nothing changed on the order.
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
60c0c54eb2 Update create_adjustment to create with an amount of 0 
Amount calculation is handled by VoucherAdjustmentService.calculate
 2023-07-14 14:47:03 +10:00
Matt-Yorkley
04bbea53e1 Move voucher processing out of checkout controller 2023-07-14 14:46:16 +10:00
Gaetan Craig-Riou
dc711bde78 Fix voucher adjustment delete 
When using a voucher with tax not incluced in price, we need to delete
both the voucher adjustment and the tax adjustment
 2023-07-14 13:37:45 +10:00
Konrad
bddc10626b Merge pull request #11148 from cillian/fix-duplicate-rows-in-customer-addresses-report 
Don't return duplicate rows in the customer addresses report
 2023-07-13 20:32:01 +02:00
Filipe
9e0aa1854f Merge pull request #11159 from abdellani/remove-split-checkout-from-feature_toggle 
Remove split checkout from feature toggle
 2023-07-13 17:20:18 +01:00
Filipe
308ce9263d Merge pull request #11170 from jibees/11160-bulk-actions-function-not-working-on-safari-mac-browser 
Admin, Orders: Make bulk actions dropdown re-enabled for Safari browser
 2023-07-13 17:17:18 +01:00
Filipe
2f8a056bee Merge pull request #11187 from jibees/10975-white-label-remember-custom-tab-activation-after-error-message 
Admin, White Label: check the custom tab checkbox if any errors on custom tab (ie. title is blank)
 2023-07-13 16:43:18 +01:00
Filipe
60c75097d3 Merge pull request #11145 from mkllnk/dfc-create-response 
DFC API return SuppliedProduct after creation
 2023-07-13 16:15:22 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
jibees
9f86218a83 Merge pull request #11202 from openfoodfoundation/dependabot/bundler/view_component-3.4.0 
chore(deps): bump view_component from 3.3.0 to 3.4.0
 2023-07-12 16:00:48 +02:00
dependabot[bot]
e03ffa0405 chore(deps): bump view_component from 3.3.0 to 3.4.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-12 09:25:11 +00:00
jibees
f22b8db462 Merge pull request #11191 from openfoodfoundation/dependabot/npm_and_yarn/semver-5.7.2 
chore(deps): bump semver from 5.7.1 to 5.7.2
 2023-07-11 17:38:28 +02:00
dependabot[bot]
90ad6ce19d chore(deps): bump semver from 5.7.1 to 5.7.2 
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-11 09:43:07 +00:00
Matt-Yorkley
4884a8c368 Merge pull request #11179 from openfoodfoundation/dependabot/npm_and_yarn/cable_ready-5.0.1 
chore(deps): bump cable_ready from 5.0.0 to 5.0.1
 2023-07-11 10:42:37 +01:00
David Cook
d03b88cf83 Rename variables 
To make it clear they are arrays
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
0fdf7876a6 Instanciate instance variable + use spread operator to be more concise 
and efficient ;)
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
4bcba86fc8 Avoid error when testing through jest about removing event listenner 
Avoid:
```
  TypeError: Cannot read properties of null (reading 'removeEventListener')
        at extended.disconnect (/home/runner/work/openfoodnetwork/openfoodnetwork/app/webpacker/controllers/dropdown_controller.js:32:14)
        at Context.disconnect (/home/runner/work/openfoodnetwork/openfoodnetwork/node_modules/stimulus/dist/stimulus.umd.js:1441:25)
```
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
6143f4ce6f Use dropdown controller to manager actions dropdown in orders page 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
7084c53f38 Do not display menu is the dropdown is 'disabled' 
ie. classList contains `disabled`
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
02aea989be Add on_click_outside behavior on dropdown_controller 
"It's a Surprise Tool That Will Help Us Later"
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
d78af187e0 Allow dropdown controller to toggle more than one class 
"It's a Surprise Tool That Will Help Us Later"
 2023-07-11 10:48:51 +02:00
Mohamed ABDELLANI
4b003aa08b replace status:status with cancelled:boolean on invoice model 2023-07-11 09:15:25 +01:00
David Cook
bb1d053825 Merge pull request #11162 from dacook/DropSpreePromotionTables 
Drop unused Spree Promotion Tables
 2023-07-11 10:16:45 +10:00
Jean-Baptiste Bellet
a8b9d9d8af Check the custom tab checkbox if any errors (ie. title is blank) 2023-07-10 16:31:33 +02:00
Gaetan Craig-Riou
9f1b4f56c0 Merge pull request #11181 from openfoodfoundation/dependabot/npm_and_yarn/tough-cookie-4.1.3 
chore(deps): bump tough-cookie from 4.0.0 to 4.1.3
 2023-07-10 12:03:02 +10:00
David Cook
b6d10df332 DropSpreePromotionTables 2023-07-10 10:51:44 +10:00
dependabot[bot]
c299f891e0 chore(deps): bump tough-cookie from 4.0.0 to 4.1.3 
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.0.0...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-09 11:11:55 +00:00
Jean-Baptiste Bellet
dab595f17f Update all locales with the latest Transifex translations v4.4.2 2023-07-07 17:11:40 +02:00
Filipe
f0bcb79c09 Merge pull request #11169 from openfoodfoundation/11164-admin-orders-actions-dropdown-is-not-well-placed 
Fix container issues introduced by #11123
 2023-07-07 11:15:14 +01:00
jibees
967c5a99c3 Merge pull request #11167 from openfoodfoundation/dependabot/bundler/faraday-2.7.10 
chore(deps): bump faraday from 2.7.9 to 2.7.10
 2023-07-07 11:50:01 +02:00
jibees
72fa132c17 Merge pull request #11172 from openfoodfoundation/dependabot/bundler/sanitize-6.0.2 
chore(deps): bump sanitize from 6.0.1 to 6.0.2
 2023-07-07 11:44:16 +02:00
dependabot[bot]
2310c665c3 chore(deps): bump cable_ready from 5.0.0 to 5.0.1 
Bumps [cable_ready](https://github.com/stimulusreflex/cable_ready) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/stimulusreflex/cable_ready/releases)
- [Changelog](https://github.com/stimulusreflex/cable_ready/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusreflex/cable_ready/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: cable_ready
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-07 09:35:52 +00:00
dependabot[bot]
9f539df5e0 chore(deps): bump sanitize from 6.0.1 to 6.0.2 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-07 09:06:31 +00:00
dependabot[bot]
74ef681607 chore(deps): bump faraday from 2.7.9 to 2.7.10 
Bumps [faraday](https://github.com/lostisland/faraday) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.7.9...v2.7.10)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-07 09:06:22 +00:00
David Cook
17da66b72a Update contents of variable directly 
Also, it makes the line shorter, allowing us to use one-line if syntax :)
 2023-07-07 14:22:36 +10:00
Gaetan Craig-Riou
fb3c99e52c Merge pull request #11121 from filipefurtad0/cart_state_orders_not_appearing_orders_page 
Cart state orders not appearing orders page
 2023-07-07 09:27:36 +10:00
Matt-Yorkley
eb71c65fc0 Merge pull request #11138 from Matt-Yorkley/variant-timestamps 
Add timestamps to variants table
 2023-07-06 18:22:19 +01:00
Mohamed ABDELLANI
f68064480a authorize distributor manager to generate invoices 2023-07-06 17:36:13 +01:00
Maikel Linke
11a4cd8613 Protect invoicing against unauthorized use 
This could be optimised for performance but this was the simplest way
and we can work on it if performance becomes a problem.
 2023-07-06 17:36:13 +01:00
Maikel Linke
15c30246a5 Allow to see only invoices of managed enterprises 2023-07-06 17:36:13 +01:00
Maikel Linke
46410b5be2 Test the right invoices controller 
I was wondering why the spec didn't work and then I noticed that it was
testing the wrong controller and passing the wrong parameter.
 2023-07-06 17:36:13 +01:00
Maikel Linke
85002d3804 Spec bug allowing any enterprise to view invoices 2023-07-06 17:36:13 +01:00
Maikel Linke
145696aa7f Create only used test data 
The `params` and the user are created before the request. But, for
example, the enterprise user doesn't need creating when testing
permissions of the normal user.
 2023-07-06 17:36:13 +01:00