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
34,369 Commits 15 Branches 458 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

34369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jibees
cc1e3912ad Merge pull request #8685 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.10 
Bump karma from 6.3.9 to 6.3.10
 2022-01-10 15:23:29 +01:00
dependabot[bot]
346ec9ef1d Bump karma from 6.3.9 to 6.3.10 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.9...v6.3.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 12:14:59 +00:00
Matt-Yorkley
fd4a18a838 Merge pull request #8680 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.7 
Bump jest from 27.4.6 to 27.4.7
 2022-01-10 12:11:12 +00:00
Jean-Baptiste Bellet
a1b21d7706 Take into account the lb unit name 2022-01-10 11:50:40 +01:00
Jean-Baptiste Bellet
f6e64f3a3c Update the tests as well 2022-01-10 11:27:32 +01:00
Jean-Baptiste Bellet
c5beff249e Should be divided by scale if the smallest unit 2022-01-10 11:27:18 +01:00
Jean-Baptiste Bellet
4c508a5bf9 Group by unit size is specific: it needs to be divided by scale if not the smallest unit 2022-01-10 11:24:22 +01:00
Jean-Baptiste Bellet
da9c0f4b8c Refactor: create two internal methods: getScale and getFormattedValueWithUnitName 
Then, the old formattedValueWithUnitName calls those two private methods
 2022-01-10 11:23:30 +01:00
Jean-Baptiste Bellet
467183af48 Rename getScale to getLineItemScale to be more specific 2022-01-10 11:22:11 +01:00
dependabot[bot]
8d46a185d6 Bump shortcut-buttons-flatpickr from 0.3.1 to 0.4.0 
Bumps [shortcut-buttons-flatpickr](https://github.com/jcsmorais/shortcut-buttons-flatpickr) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/jcsmorais/shortcut-buttons-flatpickr/releases)
- [Commits](https://github.com/jcsmorais/shortcut-buttons-flatpickr/compare/0.3.1...0.4.0)

---
updated-dependencies:
- dependency-name: shortcut-buttons-flatpickr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 09:10:22 +00:00
Jean-Baptiste Bellet
36db396fe5 Do not redirect if user is logged in 2022-01-10 10:02:08 +01:00
Jean-Baptiste Bellet
573798e4a4 Handle visit /checkout/details in both case: authorized or not 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
9a74934f79 Do not redirect to /guest if step is specified 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
b6e8862401 Update test for guest checkout when distributor doesn't allow 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
6be2fbb0b9 Specify allow_guest_orders attribute 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
b1524aa0bd Guard clause: redirect to /guest when POST 
When there is no connected user, and when the distributor doesn't allow guest orders, redirect on POST method
 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
a36d03a7ab Update test as well ; guest checkout when distributor allow 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2568d775ae Create the guest view and its associated css 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
efda693f8e Do not show tabs if the current step if the /guest step 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
f2c3a380ac Redirect to /guest if distributor doesn't allow guest order 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2929b6278d Redirect to /guest if no step required and no current connected user 2022-01-10 09:39:45 +01:00
Jean-Baptiste Bellet
3e14501337 Create a new step: the guest view 2022-01-10 09:39:45 +01:00
Transifex-Openfoodnetwork
228f6db139 Updating translations for config/locales/ru.yml 2022-01-10 18:53:37 +11:00
Filipe
54c61f459e Merge pull request #8677 from filipefurtad0/add_specs_split_checkout_1 
Migrates some test scenarios from checkout_spec.rb
 2022-01-09 16:20:41 +00:00
filipefurtad0
0af025d948 Re-writes test structure, descrive vs. context 2022-01-08 17:59:04 +00:00
Matt-Yorkley
99b75c9a6a Adjust usage of remote-method links on credit card deletion 2022-01-08 16:54:23 +00:00
Matt-Yorkley
40ed23688d Remove jquery_ujs 2022-01-08 16:54:23 +00:00
Transifex-Openfoodnetwork
fbeb295019 Updating translations for config/locales/fr_CA.yml 2022-01-08 09:09:50 +11:00
Transifex-Openfoodnetwork
d4d4b70eb2 Updating translations for config/locales/en_CA.yml 2022-01-08 08:50:21 +11:00
Matt-Yorkley
f23a12020c Merge pull request #8675 from Matt-Yorkley/dead-code-spree-js 
Remove unused JS
 2022-01-07 14:29:24 +00:00
Cillian O'Ruanaidh
e2b8108972 If an order has out of stock line items display them and let admins remove them 2022-01-07 13:15:44 +00:00
filipefurtad0
4276be1132 Simplifies/re-writes 'before do' block 2022-01-07 13:11:27 +00:00
filipefurtad0
e2c5c08c1e Updates the spec to reflect the changes in the helper 2022-01-07 13:06:28 +00:00
filipefurtad0
2df841f637 Renames module - removes 'request' naming 2022-01-07 13:03:44 +00:00
filipefurtad0
ebbc028dda Removes split_ prefix from helper 2022-01-07 12:56:15 +00:00
filipefurtad0
9149306fc1 Moves(up)/renames SplitCheckoutHelper 2022-01-07 12:55:09 +00:00
filipefurtad0
12d1e45e06 Fixes rubocop issues 2022-01-07 12:13:15 +00:00
filipefurtad0
9685bb6ae9 Adds tests for logged-in user scenarios 2022-01-07 12:13:15 +00:00
filipefurtad0
93478d4079 Adds split-checkout helper 2022-01-07 12:13:15 +00:00
filipefurtad0
447d146365 Adds test out of stock product redirect 2022-01-07 12:13:15 +00:00
Jean-Baptiste Bellet
515e2cfc51 Multiply by unit_value as sumOfUnitValues is now scaled 2022-01-07 10:32:47 +01:00
Jean-Baptiste Bellet
b746eacd11 Both sumUnitValues and sumMaxUnitValues should handle imperial units 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
5db50481dd Rounding to 3 decimals as scope method 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
d4435b5f10 Update variant_unit_manager_spec.js.coffee 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
9cf5645478 Add a spec to handle imperial units 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
7b2a9df326 Handle unitsVariant when calling formattedValueWithUnitName 
- unitsVariant was unread but is necessary to compute the unit_name thanks to `VariantUnitManager.getUnitName()`
 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
3922ffa6a9 Handle imperial units for VariantUnitManager 2022-01-07 10:32:45 +01:00
Transifex-Openfoodnetwork
9c37cd68f8 Updating translations for config/locales/en_US.yml 2022-01-07 03:29:40 +11:00
Matt-Yorkley
14a62f5d49 Change paths helpers to urls 2022-01-06 13:10:48 +00:00
Matt-Yorkley
95464cf956 Update uses of (removed) jsuri interface 2022-01-06 13:10:48 +00:00