raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,847 Commits 21 Branches 450 Tags
5a61722f8bb7c331c0fe5ca7fb97a75f951b07f4
Commit Graph

25847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
5a61722f8b + force FlatRate as calculator for payment methods in spec 2023-01-16 09:31:15 +01:00
Jean-Baptiste Bellet
719025f98e Only set calculator if it's a new record (having an id) 
Unless we have a ActiveRecord::NotNullViolation
```
     ActiveRecord::NotNullViolation:
       PG::NotNullViolation: ERROR:  null value in column "calculable_id" of relation "spree_calculators" violates not-null constraint
       DETAIL:  Failing row contains (9370, Calculator::None, null, Spree::ShippingMethod, 2023-01-12 15:09:44.381142, 2023-01-12 15:09:44.381142).
     # ------------------
     # --- Caused by: ---
     # PG::NotNullViolation:
     #   ERROR:  null value in column "calculable_id" of relation "spree_calculators" violates not-null constraint
     #   DETAIL:  Failing row contains (9370, Calculator::None, null, Spree::ShippingMethod, 2023-01-12 15:09:44.381142, 2023-01-12 15:09:44.381142).

```
 2023-01-16 09:31:15 +01:00
Jean-Baptiste Bellet
a9097df112 Already defined via CalculatedAdjustments 2023-01-16 09:31:15 +01:00
Jean-Baptiste Bellet
7015cb30c3 Calculator 'None' is the default one for both shipping and payment method 
+ update specs as well

Update shipping_method.rb
 2023-01-16 09:31:15 +01:00
Jean-Baptiste Bellet
a793fc9f99 Create a "None" calculator for shipping and payment methods 
Only for payment and shipping methods
 2022-12-27 17:49:48 +01:00
Filipe
c96bba8094 Merge pull request #10137 from ijdershem/idersh/issue-9834-pt2 
[OFN-9834-PT2] Fix new product form error label styling
 2022-12-26 11:54:25 +00:00
Filipe
45a49d01ec Merge pull request #10064 from abdellani/add_final_weight_to_occt_report_ 
Add final weight to occt report
 2022-12-26 11:32:08 +00:00
dependabot[bot]
3b6d0a8760 Merge pull request #10203 from openfoodfoundation/dependabot/bundler/mini_portile2-2.8.1 2022-12-26 10:00:23 +00:00
dependabot[bot]
5f4aed92d8 Merge pull request #10204 from openfoodfoundation/dependabot/bundler/simplecov-0.22.0 2022-12-26 09:59:51 +00:00
dependabot[bot]
a118c786ef Merge pull request #10202 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.1.0 2022-12-26 09:58:11 +00:00
dependabot[bot]
1572a81274 Merge pull request #10205 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.17.4 2022-12-26 09:55:12 +00:00
dependabot[bot]
6f8dc4dd79 Bump rubocop-rails from 2.17.3 to 2.17.4 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.17.3 to 2.17.4.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.17.3...v2.17.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 09:03:23 +00:00
dependabot[bot]
6879643044 Bump simplecov from 0.21.2 to 0.22.0 
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.21.2 to 0.22.0.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases)
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md)
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.2...v0.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 09:02:54 +00:00
dependabot[bot]
2a0cd5e275 Bump mini_portile2 from 2.8.0 to 2.8.1 
Bumps [mini_portile2](https://github.com/flavorjones/mini_portile) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/flavorjones/mini_portile/releases)
- [Changelog](https://github.com/flavorjones/mini_portile/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/mini_portile/compare/v2.8.0...v2.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 09:01:28 +00:00
dependabot[bot]
af7c11bb3e Bump @floating-ui/dom from 1.0.12 to 1.1.0 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.0.12 to 1.1.0.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.1.0/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 09:01:28 +00:00
dependabot[bot]
046d7d5f44 Merge pull request #10189 from openfoodfoundation/dependabot/bundler/rubocop-1.41.1 2022-12-26 08:40:18 +00:00
dependabot[bot]
81e1bb19a3 Merge pull request #10190 from openfoodfoundation/dependabot/bundler/view_component-2.80.0 2022-12-26 08:39:55 +00:00
dependabot[bot]
d30d3d256d Merge pull request #10196 from openfoodfoundation/dependabot/bundler/jwt-2.6.0 2022-12-26 08:39:35 +00:00
dependabot[bot]
850c845992 Merge pull request #10197 from openfoodfoundation/dependabot/bundler/debug-1.7.1 2022-12-26 08:39:07 +00:00
Mohamed ABDELLANI
f1b81613d6 fix OCCT unit test 2022-12-26 08:47:42 +01:00
Mohamed ABDELLANI
e3914ed306 add final_weight_volume column to the hidden by default column of OCCT report 2022-12-26 08:29:36 +01:00
ijdershem-jf
ef092dd53a [OFN-9834] Fix red error highlighting on product unit value label 
[OFN-9834] Fix unit value form label association

[OFN-9834] Update tests to reference correct product unit 'Value' field id
 2022-12-24 18:36:41 -07:00
ijdershem-jf
5e0287d93f [9834] Fix red error highlighting on product category select label 2022-12-24 18:13:23 -07:00
ijdershem-jf
58fb2ebe29 [9834] Fix red error highlighting on product unit selection label 2022-12-24 09:44:37 -07:00
dependabot[bot]
cb4b54c927 Bump rubocop from 1.41.0 to 1.41.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.41.0 to 1.41.1.
- [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.41.0...v1.41.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-24 10:27:11 +00:00
dependabot[bot]
a9a7ad5cb3 Bump debug from 1.7.0 to 1.7.1 
Bumps [debug](https://github.com/ruby/debug) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/ruby/debug/releases)
- [Commits](https://github.com/ruby/debug/compare/v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: debug
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-24 10:27:04 +00:00
dependabot[bot]
46562aace7 Bump view_component from 2.79.0 to 2.80.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.79.0 to 2.80.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/v2.79.0...v2.80.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>
 2022-12-24 10:26:49 +00:00
dependabot[bot]
a57d1863c0 Bump jwt from 2.5.0 to 2.6.0 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.5.0...v2.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-24 10:26:11 +00:00
jibees
fd74473bdd Merge pull request #10199 from filipefurtad0/fixes_list_spec 
Changes dates to be dynamic using Time.zone.now
 2022-12-24 11:22:34 +01:00
filipefurtad0
78c29f2c6a Changes dates to be dynamic using Time.zone.now 
Strips leading zeroes from datepicker assertion
 2022-12-23 17:11:49 +00:00
Rachel Arnould
7a62a95e0b Merge pull request #10103 from binarygit/stop-horizontal-scroll-of-body-in-order-summary-page 
[Split Checkout] Stop horizontal scroll on body in order summary page
v4.2.27 		2022-12-23 10:29:21 +01:00
Jean-Baptiste Bellet
b8e4dcac7c Update all locales with the latest Transifex translations 2022-12-23 10:27:19 +01:00
Filipe
944d552f6b Merge pull request #10156 from ijdershem/idersh/issue-9834-pt3 
[OFN-9834-PT3] Add placeholder for new product supplier field
 2022-12-22 15:42:38 +00:00
Filipe
c3e4c53a01 Merge pull request #10074 from binarygit/order-cycle-closes-during-split-co 
Redirect to shopfront when Order cycle closes during split checkout
 2022-12-22 15:09:57 +00:00
Filipe
ae59621341 Merge pull request #10174 from ijdershem/idersh/OFN-9870 
[OFN-9870] Correct error message for differing variant_unit_name for same product in import
 2022-12-22 11:20:12 +00:00
Filipe
d61affd82b Merge pull request #10093 from vviekk/viv/noneTranslate 
Translating text 'None' for tax and shipping categories of the product
 2022-12-21 21:45:05 +00:00
jibees
c0364a845d Merge pull request #10172 from filipefurtad0/fix_flaky_invoice_spec_2 
Removes line break for displaying product units
 2022-12-21 18:37:50 +01:00
Filipe
47e100607c Merge pull request #10041 from abdellani/add_on-hand_and_on-demand_to_product_report 
Add 'on hand' and 'on demand' to Products report
 2022-12-21 17:31:21 +00:00
filipefurtad0
7f17bfaa9a Separates assertions to account for line breaks 
Rubocop corrections
 2022-12-21 17:25:30 +00:00
jibees
e9f92d39aa Merge pull request #10184 from abdellani/fix-zeitwork-load-exception 
prevent loading the reporting module if already loaded [dev environment]
 2022-12-21 11:26:19 +01:00
Mohamed ABDELLANI
23462e9965 avoid loading reporting lib if it's already loaded 2022-12-21 10:58:48 +01:00
Mohamed ABDELLANI
0d0c568b10 overwrite the default fields_to_hide to [] on OrderCycleSupplierTotals tests 2022-12-21 07:33:05 +01:00
Mohamed ABDELLANI
155b8ed725 subtract fields_to_hide when the fields_to_show are calculated 2022-12-21 07:32:18 +01:00
Mohamed ABDELLANI
11ea6b39cf test if All products report returns on_hand and on_demand 2022-12-21 07:23:32 +01:00
ijdershem-jf
18e9aba6b8 [OFN-9870] Display accurate error message for differing variant_unit_name for same product in import 2022-12-20 08:19:47 -07:00
Filipe
561458ce43 Merge pull request #9933 from Laurel16/instagram 
Admin, Enterprise Settings, Social: Add instagram handler validator
 2022-12-20 12:40:57 +00:00
Filipe
6f3d27b99b Merge pull request #10089 from abdellani/fix-payment-non-3d-need-to-be-manually-captured-in-BO 
Fix Payments with non-3D cards need to be manually captured in the BO (Split checkout)
 2022-12-20 10:09:45 +00:00
dependabot[bot]
8e5495c34d Merge pull request #10176 from openfoodfoundation/dependabot/bundler/rubocop-1.41.0 2022-12-20 09:18:06 +00:00
dependabot[bot]
59b727aa95 Bump rubocop from 1.40.0 to 1.41.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.40.0 to 1.41.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.40.0...v1.41.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-20 09:04:30 +00:00
binarygit
3b179e75a4 Stop horizontal scroll on body in cart page 2022-12-19 21:30:31 +05:45