raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,850 Commits 16 Branches 456 Tags
8b047cd449987ba4cfbf84dcccdb3729bb5839ce
Commit Graph

23850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
4606d81a28 Remove old config comments 
SSL is enforced via `config.force_ssl = true` in the same files. We
don't need that comment any more.
 2022-03-16 17:29:59 +11:00
filipefurtad0
4bdce59648 Clarifies context 2022-03-15 16:30:38 +00:00
filipefurtad0
ba5bdf688c Removes new address assignment; uses change helper 2022-03-15 16:14:44 +00:00
Nihal Mohammed
df7227443a Replace deprecated any_instace syntax with allow_any_instance_of in spec/system/consumer/registration_spec.rb 2022-03-15 05:35:43 +05:30
Nihal Mohammed
b3771bb623 Use bypass_sign_in method instead of bypass option in app/controllers/spree/users_controller.rb 2022-03-15 05:35:43 +05:30
Nihal Mohammed
8ceeaaa7d4 Fix deprecated Object warning in lib/spree/localized_number 2022-03-15 05:35:43 +05:30
Nihal Mohammed
ad52805a0d Change errors to be accessed by a block with single paramter instead of hash 2022-03-15 05:35:22 +05:30
filipefurtad0
f09f6df181 Adds coverage on shipping address 2022-03-14 13:49:32 +00:00
filipefurtad0
13b7d80632 Saves address for user 2022-03-14 13:14:11 +00:00
Nihal Mohammed
ccc3322c12 Change deprecated file path upload path syntax in enterprises_controller_spec 2022-03-14 18:42:58 +05:30
Nihal Mohammed
0f6b335a22 Change deprecated syntax File.exists? to File.exist? 2022-03-14 18:41:00 +05:30
filipefurtad0
6ba351f68f Updates spec to consider bug fix #8958 2022-03-14 12:51:20 +00:00
filipefurtad0
4877f96b4b Adds coverage on default billing address checkbox 2022-03-14 12:48:00 +00:00
filipefurtad0
ffe2a3076c Cleans up helper file and spec 2022-03-14 11:52:24 +00:00
Transifex-Openfoodnetwork
fb83ae2ad4 Updating translations for config/locales/en_GB.yml 2022-03-14 22:48:06 +11:00
dependabot[bot]
b9e0a5ecf7 Bump flatpickr from 4.6.9 to 4.6.11 
Bumps [flatpickr](https://github.com/chmln/flatpickr) from 4.6.9 to 4.6.11.
- [Release notes](https://github.com/chmln/flatpickr/releases)
- [Commits](https://github.com/chmln/flatpickr/compare/v4.6.9...v4.6.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-14 09:05:55 +00:00
Jean-Baptiste Bellet
ea3e15f0c8 Max|Current fulfilled value is the max|current divided by group_buy_unit_size 
+ improve testing with representative values
 + Update bulk_order_management_spec.rb and revert previously changed values
 2022-03-14 09:06:05 +01:00
Jean-Baptiste Bellet
bcf6c7984e Display checkbox that "save as default address" 2022-03-14 09:05:45 +01:00
jibees
483ec42328 Merge pull request #8990 from jibees/8984-sc-test-failed 
SplitCheckout: improve test that failed
 2022-03-14 09:03:26 +01:00
Jean-Baptiste Bellet
65596f8467 Do not replace shipping_methods array but push into 2022-03-11 14:34:58 +01:00
Transifex-Openfoodnetwork
d273e97b88 Updating translations for config/locales/de_DE.yml 2022-03-12 00:29:23 +11:00
Transifex-Openfoodnetwork
b410585449 Updating translations for config/locales/en_FR.yml 2022-03-11 23:43:53 +11:00
Transifex-Openfoodnetwork
ac08602d94 Updating translations for config/locales/fr.yml 2022-03-11 23:43:14 +11:00
Jean-Baptiste Bellet
147d15332c Update all locales with the latest Transifex translations v4.1.21 2022-03-11 09:17:43 +01:00
jibees
31b60ca069 Merge pull request #8949 from openfoodfoundation/transifex 
Transifex
 2022-03-11 09:15:24 +01:00
jibees
1c5ada4d7c Merge pull request #8970 from seballot/docker-nodejs 
Docker: upgrade nodeJs from 10 to 14
 2022-03-11 09:03:25 +01:00
jibees
04ed7e4a94 Merge pull request #8972 from jibees/8965-retrieve-scale-of-a-product-in-the-BOM-interface 
Improve the way we get the unit value (g, oz, lb, ...) in the Bulk Order Management interface
 2022-03-11 09:01:02 +01:00
jibees
d4a4a36b14 Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion 
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
 2022-03-11 08:56:41 +01:00
Filipe
6474055380 Merge pull request #8964 from jibees/8963-display-shipping-options-checkboxes 
SplitCheckout: Display shipping options checkboxes on invalid form submit
 2022-03-10 16:41:10 +00:00
Filipe
3cf2db68b1 Merge pull request #8945 from jibees/8914-do-not-display-shipping-method-backoffice-only-for-split-checkout 
SplitCheckout: display only shipping method that are set as front end available
 2022-03-10 16:13:42 +00:00
Filipe
1522263cfc Merge pull request #8893 from jibees/8889-handle-redirect-to-next-step-for-the-split-checkout 
SplitCheckout: handle navigation between steps
 2022-03-10 16:07:58 +00:00
Filipe
3e4b39c26b Merge pull request #8966 from jibees/8958-improve-use-of-checkboxes-values-in-split-checkout 
Splitcheckout: Don't save bill|ship address when associated checkbox is not checked during checkout process
 2022-03-10 15:48:27 +00:00
Jean-Baptiste Bellet
e3a529be5d Display only shipping method that are set as front end available 
and update the tests as well
 2022-03-10 16:15:50 +01:00
Jean-Baptiste Bellet
60ad92c4ff Display ship address options checkboxes 
+ Create the associated test: the trick is is that the selected delivery method is the one that required address **and** is before others that do not required ship address
 2022-03-10 15:55:10 +01:00
Jean-Baptiste Bellet
20d5c45b7a Remove :debug tag 2022-03-10 15:53:19 +01:00
Filipe
6ce29f81d8 Merge pull request #8920 from apricot12/Remove_checkout_only_option_from_payment_methods_display 
Remove checkout only option from payment methods edit form.
 2022-03-10 14:38:45 +00:00
dependabot[bot]
0b1697c62b Bump karma-chrome-launcher from 3.1.0 to 3.1.1 
Bumps [karma-chrome-launcher](https://github.com/karma-runner/karma-chrome-launcher) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/karma-runner/karma-chrome-launcher/releases)
- [Changelog](https://github.com/karma-runner/karma-chrome-launcher/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma-chrome-launcher/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: karma-chrome-launcher
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-10 09:05:18 +00:00
Maikel
e2f68dac54 Merge pull request #8977 from filipefurtad0/split_checkout_fees 
Split-checkout transaction and shipping fees
 2022-03-10 10:47:27 +11:00
Sebastian Castro
6f6a78b5a2 Docker: upgrade nodeJs from 10 to 14 2022-03-09 09:28:59 +00:00
filipefurtad0
16fcde7053 Fixes rubocop offenses 2022-03-08 23:13:24 +00:00
filipefurtad0
a6486c2701 Adds assertion on the order confirmation page 2022-03-08 23:12:05 +00:00
filipefurtad0
509a114d51 Adds coverage on transaction fees for split checkout 2022-03-08 23:10:48 +00:00
filipefurtad0
1fdd36e491 Adds coverage on shipping fees, on split checkout 2022-03-08 22:30:14 +00:00
Jean-Baptiste Bellet
0ccba7f144 As the product unit is 'g', we now display information in 'g' 2022-03-08 15:52:50 +01:00
Jean-Baptiste Bellet
915714246f Directly use the variant_unit_scale instead of VariantUnitManager.getScale 
and update the tests as well
 2022-03-08 14:59:08 +01:00
Jean-Baptiste Bellet
adcdca812d Delete that getScale method which is now useless 
since we now rely on the serialized variant_unit_scale
 2022-03-08 14:58:34 +01:00
Jean-Baptiste Bellet
aa71e12020 Serialize variant_unit_scale to be used in the Bulk Order Managment 
to retrieve scale of the product
 2022-03-08 14:55:25 +01:00
Jean-Baptiste Bellet
1fe7ebcec2 Check uncheck save_bill|ship_address don't save bill|ship_address 2022-03-07 17:42:06 +01:00
Jean-Baptiste Bellet
440e5aaf97 Default checked/unchecked values for checkbox is 0/1 2022-03-07 17:41:05 +01:00
Filipe
53d1994b2a Merge pull request #8956 from Matt-Yorkley/welsh-javascript-fixes 
Fix Angular interpolation for translations with apostrophes
 2022-03-07 12:23:04 +00:00