raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,440 Commits 19 Branches 453 Tags
1cd87c170b56322cccfa86f7db9c5c513ef2e1a8
Commit Graph

28440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
1cd87c170b Use new staging deployment method 2023-08-15 21:35:12 +10:00
David Cook
8b9d483227 Add more detailed notes for current process 2023-08-15 21:35:10 +10: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
Gaetan Craig-Riou
70bd714369 Finish calculation for percentage voucher 
Add calculation when tax is not included in price
 2023-08-11 14:51:36 +10:00
Gaetan Craig-Riou
cdb33aa0d0 Add calculation for percentage voucher 
It include calculation for order with taxes included in the price
 2023-08-11 14:30:48 +10:00
David Cook
e536393f02 Merge pull request #11389 from mkllnk/session_store 
Remove ignored session store config
 2023-08-11 14:27:44 +10:00
Gaetan Craig-Riou
cc9069e9c6 Add voucher type to admin screen 
Plus specs
 2023-08-11 14:19:26 +10:00
Gaetan Craig-Riou
619285ad4a Add voucher_type to voucher 
And update related specs
voucher_type doesn't do anything for now.
 2023-08-11 14:19:25 +10:00
Gaetan Craig-Riou
1be8daaf86 Add specs to cover re calculation 
It is important that the calculated voucher adjustments don't change
if they are recalculated and it is equally important that they are
updated if the order has changed
 2023-08-11 14:19:25 +10:00
Maikel
fc8e39987a Merge pull request #11385 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.132.1 
chore(deps): bump aws-sdk-s3 from 1.132.0 to 1.132.1
 2023-08-11 11:39:14 +10:00
Maikel Linke
7fe74e811e Remove ignored session store config 
We set the session store in an initializer and therefore the development
config was overridden without having any effect.
 2023-08-11 10:27:37 +10:00
Konrad
60212f92c3 Merge pull request #11270 from rioug/9553-removing-cutomer-tag-when-search-for-tag 
Fix removing customer tag when using search bar for said tag
 2023-08-11 00:11:55 +02:00
Konrad
c3414143e6 Merge pull request #11222 from Matt-Yorkley/checkout-controller 
Reduce controller size
 2023-08-10 23:28:57 +02:00
Konrad
f59e681826 Merge pull request #11259 from cillian/single-line-voucher-code 
Don't allow multi-line voucher codes
 2023-08-10 23:09:55 +02:00
Matt-Yorkley
df077caafa Merge pull request #11375 from Matt-Yorkley/drop-unused-tables 
Drop unused tables
 2023-08-10 12:28:14 +01:00
Matt-Yorkley
f19d66f4d6 Drop unused tables 2023-08-10 12:27:31 +01:00
Matt-Yorkley
688b411e97 Merge pull request #11374 from Matt-Yorkley/drop-variant-master-column 
Drop :is_master column from variants table
 2023-08-10 12:25:59 +01:00
Matt-Yorkley
b82f368bec Drop :is_master column from variants table 2023-08-10 12:25:18 +01:00
Matt-Yorkley
128d5c29bd Merge pull request #11373 from Matt-Yorkley/drop-options-tables 
Drop option_types and option_values tables
 2023-08-10 12:21:39 +01:00
jibees
95612a8cb6 Merge pull request #11384 from openfoodfoundation/dependabot/bundler/rails-7.0.7 
chore(deps): bump rails from 7.0.6 to 7.0.7
 2023-08-10 12:13:07 +02:00
dependabot[bot]
4bbd9e9d49 chore(deps): bump aws-sdk-s3 from 1.132.0 to 1.132.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.132.0 to 1.132.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-10 09:55:40 +00:00
dependabot[bot]
f08a7ea254 chore(deps): bump rails from 7.0.6 to 7.0.7 
Bumps [rails](https://github.com/rails/rails) from 7.0.6 to 7.0.7.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v7.0.6...v7.0.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-10 09:53:38 +00:00
jibees
f58fedfc86 Merge pull request #11376 from mkllnk/flaky-voucher-spec 
Stabilise flaky checkout spec with voucher
 2023-08-10 09:10:59 +02:00
Matt-Yorkley
5c0329ce17 Drop option_types and option_values tables 2023-08-10 11:52:10 +10:00
Maikel
8db8d6de8d Merge pull request #11372 from Matt-Yorkley/remove-variant-position 
Remove unused variant :position attribute
 2023-08-10 11:48:55 +10:00
Maikel
507803c2dc Merge pull request #11371 from jibees/8443-missing-translation-passwords-not-matching-or-too-short 
Account creation: translate some messages around password creation
 2023-08-10 11:40:56 +10:00
Maikel Linke
04bba2adf1 Stabilise flaky checkout spec with voucher 
While applying a voucher the spec tried to proceed the checkout before
the voucher update completed rendering. It failed when the machine was
slow.

With rspec-slow-repeate I got 100% fail rate before and 100% pass after
this change.
 2023-08-10 10:05:01 +10:00
Maikel
926c8aed94 Merge pull request #11354 from abdellani/fix-rename-invoice-generate-update-button 
rename 'new invoice' button to 'create or update invoice'
 2023-08-10 09:59:11 +10:00
Mohamed ABDELLANI
620dd70dd7 rename 'new invoice' button to 'create or update invoice' 2023-08-10 09:35:13 +10:00
Matt-Yorkley
a33b6e0ec9 Update variant sorting 2023-08-09 18:30:56 +01:00
Matt-Yorkley
e65efe0f85 Remove unused variant :position attribute 2023-08-09 18:24:46 +01:00
Rachel Arnould
4505beff98 Merge pull request #11327 from bouaik/fix-display-invoice-tab-for-completed-resumed-canceled-only 
Fix display invoice tab for completed, resumed and canceled orders only
 2023-08-09 18:37:02 +02:00
Jean-Baptiste Bellet
1f5dc1f864 Add ActiveRecords messages for translation in account creation 2023-08-09 16:58:08 +02:00
Rachel Arnould
2b108dfeee Merge pull request #11116 from abdellani/fix-show-date-only-on-invoices-list 
render date without time on invoices list
 2023-08-09 14:33:40 +02:00
jibees
249dea56f3 Merge pull request #11366 from openfoodfoundation/dependabot/bundler/rubocop-1.56.0 
chore(deps-dev): bump rubocop from 1.55.1 to 1.56.0
 2023-08-09 11:35:25 +02:00
dependabot[bot]
467a63cf12 chore(deps-dev): bump rubocop from 1.55.1 to 1.56.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.55.1 to 1.56.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.55.1...v1.56.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-09 09:20:52 +00:00