raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,367 Commits 20 Branches 451 Tags
bba41177b48a193cd80d74eebee96dddef7cdcef
Commit Graph

26367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
bba41177b4 Remove old test setup code of feature specs 
The `js: true` tag was only used in feature specs. Some system specs
still contain that tag but they don't require this file. So it's dead
code.
 2023-02-24 15:04:03 +11:00
Filipe
3ffe39d467 Merge pull request #10448 from vviekk/viv/10009 
Fixing Enterprise creation submit button behavior
 2023-02-23 16:00:53 +00:00
vviekk
956ed826a1 Adding test 2023-02-23 20:02:02 +05:30
David Cook
06d370a8ac Update all locales with the latest Transifex translations v4.2.36 2023-02-23 13:00:36 +11:00
David Cook
013533f7de Merge pull request #10397 from openfoodfoundation/dependabot/bundler/roo-2.10.0 
Bump roo from 2.9.0 to 2.10.0
 2023-02-23 10:53:50 +11:00
David Cook
d199dea5eb Style fix: Layout/EmptyLines 2023-02-23 10:12:06 +11:00
David Cook
084211f52a Add comments 2023-02-23 10:10:32 +11:00
Filipe
604fd75cff Merge pull request #10247 from abdellani/sales_tax_totals_by_order 
sales tax totals by order report
 2023-02-22 20:03:45 +00:00
Konrad
8b89c8d7e0 Merge pull request #10451 from cyrillefr/Sort-properly-date-chronologically-and-not-lexicographically 
Sort correctly in Bulk Order Managment
 2023-02-22 14:39:03 +01:00
cyrillefr
e4845f4165 Add a spec for sorting in Bulk Order management 2023-02-20 21:43:05 +01:00
cyrillefr
c015b2066f Sort correctly in Bulk Order Managment 
Converting date to utc + iso8601 format is
    sufficient to ensure proper sorting.
 2023-02-20 21:41:58 +01:00
Konrad
f7f49377b4 Merge pull request #10297 from cyrillefr/convert-admin-order-cancellation-workflow-to-stimulus-reflex 
Convert admin order cancellation workflow to stimulus reflex
 2023-02-20 21:38:33 +01:00
Mohamed ABDELLANI
960dd81b76 remove customer id filter 2023-02-20 14:58:51 +01:00
Mohamed ABDELLANI
dda61d17ee delegate distributor && order_cycle to the order in the OrderFeesHandler 2023-02-20 14:19:08 +01:00
Mohamed ABDELLANI
8ff197457e test accessing the Sales Tax Report By Order using different roles 2023-02-20 14:19:08 +01:00
Mohamed ABDELLANI
c43834915d sales_tax_totals_by_order report 2023-02-20 14:19:08 +01:00
Filipe
10d8e80c45 Merge pull request #10420 from anansilva/9311-remove-code-generating-receipts 
Remove code generating receipts
 2023-02-20 12:44:13 +00:00
jibees
4e2430ea58 Merge pull request #10454 from openfoodfoundation/dependabot/bundler/sidekiq-7.0.5 
Bump sidekiq from 7.0.4 to 7.0.5
 2023-02-17 14:57:42 +01:00
Maikel Linke
e2ea4d21f4 Update translations v4.2.35 2023-02-17 14:12:24 +11:00
Filipe
2f0e00370b Merge pull request #10385 from rioug/10350-BUU-read-only-product-list-take-2 
New product page, add missing column and handle formatting
 2023-02-16 18:41:05 +00:00
dependabot[bot]
45da8fddf1 Bump sidekiq from 7.0.4 to 7.0.5 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/sidekiq/sidekiq/releases)
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.0.4...v7.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-16 18:29:21 +00:00
Filipe
b91bb8961f Merge pull request #10434 from openfoodfoundation/dependabot/bundler/sidekiq-7.0.4 
Upgrade sidekiq from 6.5.8 to 7.0.4 (incl new metrics tab)
 2023-02-16 18:18:17 +00:00
Filipe
5e3b0cf47c Merge pull request #10433 from openfoodfoundation/dependabot/npm_and_yarn/rails/webpacker-5.4.4 
Bump @rails/webpacker from 5.4.3 to 5.4.4
 2023-02-16 18:05:13 +00:00
Filipe
ba46756cba Merge pull request #10445 from cyrillefr/Remov-I18nt-keys-from-automated-tests#9499 
Remov i18nt keys from automated tests#9499
 2023-02-16 17:51:08 +00:00
Filipe
f6c9246e20 Merge pull request #10343 from jibees/9538-track-404-errors-in-bugsnag 
Notify bugsnag on 404 errors
 2023-02-16 17:45:41 +00:00
Konrad
11e9329b97 Merge pull request #10351 from rioug/9874-order-cycle-creation-fix-needless-warning-and-data-loss 
Order cycle creation, fix needless warning and add warning to prevent data loss
 2023-02-16 16:08:37 +01:00
Rachel Arnould
1a7598d96d Merge pull request #10428 from jibees/9145-Splitcheckout,-add-error-message-when-no-shipping-methods-are-available-to-the-customer 
SplitCheckout: improve error messages in flash banner to improve user experience
 2023-02-16 15:33:12 +01:00
Jean-Baptiste Bellet
2eec3d625a Notify bugsnag on 404 errors 2023-02-16 13:45:42 +00:00
cyrillefr
ba30606052 Remove I18n keys from consumer specs 2023-02-16 14:33:17 +01:00
cyrillefr
f6f62515b5 Remove I18n keys in system admin specs 2023-02-16 14:33:09 +01:00
cyrillefr
a75892ccc1 Remove I18n keys in support specs 2023-02-16 14:28:14 +01:00
cyrillefr
0082653170 Remove I18n keys in service specs 2023-02-16 14:28:14 +01:00
cyrillefr
cc0b23c0bd Remove I18n keys in request specs 2023-02-16 14:28:14 +01:00
cyrillefr
b3ad5aeaca Remove I18n keys in model specs 2023-02-16 14:28:14 +01:00
cyrillefr
ffe9756f50 Removes I18n keys in mailer specs 2023-02-16 14:27:21 +01:00
dependabot[bot]
40eb5e320b Bump @rails/webpacker from 5.4.3 to 5.4.4 
Bumps [@rails/webpacker](https://github.com/rails/webpacker) from 5.4.3 to 5.4.4.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/v5.4.4/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.3...v5.4.4)

---
updated-dependencies:
- dependency-name: "@rails/webpacker"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-16 11:06:29 +00:00
jibees
4e4a392a8c Merge pull request #10443 from openfoodfoundation/dependabot/npm_and_yarn/cable_ready-5.0.0-pre10 
Bump cable_ready from 5.0.0-pre9 to 5.0.0-pre10
 2023-02-16 12:00:48 +01:00
Filipe
e3fa933699 Merge pull request #10381 from anansilva/8229-listing-orders-payment-state-cancelled-order 
Update payment (cash/EFF) state on cancelled order
 2023-02-15 12:06:38 +00:00
cyrillefr
78a6317c84 Remove I18n keys in reports lib specs 2023-02-15 11:08:19 +01:00
cyrillefr
fa57e37467 Remove I18n keys in User ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
7c24f6b26f Remove I18n keys from Pay/Stripe/Chkout Ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
f9f6abf740 Remove I18n keys from Api Ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
e6c0dd95c4 Remive I18n keys in Admin ctrller specs 2023-02-15 11:08:19 +01:00
dependabot[bot]
ade2eda638 Bump cable_ready from 5.0.0-pre9 to 5.0.0-pre10 
Bumps [cable_ready](https://github.com/stimulusreflex/cable_ready) from 5.0.0-pre9 to 5.0.0-pre10.
- [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/commits)

---
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-02-15 09:57:26 +00:00
Jean-Baptiste Bellet
0a3d362282 Still improve error message for Billing address 
```
"Bill" is a person's name, and I don't know his address
```

;)
 2023-02-15 10:07:59 +01:00
Jean-Baptiste Bellet
08fb496f55 Don't need to show any ship_address errors if no ship selected nor 
if the ship_address is the same than the billing one
 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
4cea7b1957 Improve error message, and use the same than the view 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
88607a3dce Improve bill address error message 
"(Street + House number)" instead of "address1"
and "postcode" instead of "zipcode"
 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
a39598d049 Reorder error messages to improve readability 
tbs;
 2023-02-15 09:52:10 +01:00
Jean-Baptiste Bellet
9a03023b6b Replace bill_address phone by Customer phone to improve readability 
TBS;
 2023-02-15 09:44:26 +01:00