raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nihal Mohammed
e2bdc69a90 Update available_payment_methods method in enterprises_helper and order model 2022-03-07 17:33:09 +05:30
Nihal Mohammed
e0e800a53f Remove translations for checkout only from edit form and index for payment methods 2022-03-07 17:33:09 +05:30
Nihal Mohammed
3820d4c591 Removed checkout only from DISPLAY options on payment method edit form and updated payment_method_spec 2022-03-07 17:33:09 +05:30
Nihal Mohammed
b0fd333126 Added migration to update display_on column in spree_payment_methods table where string is 'front_end' to NULL 2022-03-07 17:32:23 +05:30
Filipe
5606be7199 Merge pull request #8944 from jibees/8940-display-update-button-on-order-unless-order-is-complete 
Split checkout: Display "Update" button on the order table page unless order is complete
 2022-03-07 11:58:34 +00:00
Transifex-Openfoodnetwork
8982b34342 Updating translations for config/locales/en_GB.yml 2022-03-07 22:34:59 +11:00
Filipe
be2898f5a2 Merge pull request #8916 from jibees/8894-login-during-guest-checkout 
SplitCheckout: as guest user, after login should redirect to the first step of checkout
 2022-03-07 09:20:12 +00:00
Jean-Baptiste Bellet
7ca6434b14 Improve the test to delete a cloned order_cycle 2022-03-04 11:34:19 +01:00
Filipe
80ad18a684 Merge pull request #8953 from jibees/8951-load-stripejs-in-test-environment 
Change css selector from stripe elements in test environment.
 2022-03-04 09:57:28 +00:00
Matt-Yorkley
6729119489 Fix Angular interpolation for translations with apostrophes 2022-03-03 20:59:04 +00:00
Transifex-Openfoodnetwork
0b6288d97f Updating translations for config/locales/hu.yml 2022-03-04 01:27:19 +11:00
Jean-Baptiste Bellet
f8f57a31db Use the right selector 
In test env. we don't use the stripejs but a mock. Slightly different.
 2022-03-03 14:14:39 +01:00
Jean-Baptiste Bellet
5fc7d72b09 Check destroying order_cycle will delete associated coordinator fees 2022-03-03 09:06:38 +01:00
Transifex-Openfoodnetwork
9724b07062 Updating translations for config/locales/de_DE.yml 2022-03-03 03:48:11 +11:00
Filipe
0a9c3b1538 Merge pull request #8932 from filipefurtad0/change_paypal_spec 
Clarifies context in checkout_paypal_spec and implements tests as shared examples
 2022-03-02 12:21:13 +00:00
Jean-Baptiste Bellet
771f7b0393 Delete coordinators_fees linked to an order_cycle when it is destroyed 2022-03-02 11:00:04 +01:00
Transifex-Openfoodnetwork
87723217ec Updating translations for config/locales/ru.yml 2022-03-02 20:04:35 +11:00
Maikel Linke
12d989568e Safer API error reporting 
We don't know what unknown errors would report. They could expose
sensitive data. So let's not pass that data on to the public while we
have the full details in Bugsnag.

Also, let's not catch Exception because that could catch interrupts to
gracefully shut down the application.
 2022-03-02 11:59:35 +11:00
Maikel Linke
4aa70c1ffd Render pagination errors 2022-03-02 11:59:35 +11:00
Maikel Linke
b89715149c Sanitise pagination input for new API 2022-03-02 11:59:35 +11:00
Maikel Linke
75fc35574e Make json_response test helper deal with error response 
It raised an error:

     NoMethodError:
       undefined method `map' for nil:NilClass
 2022-03-02 11:59:35 +11:00
Maikel Linke
414bf5d074 Don't list guest customer records to guest users 2022-03-02 11:59:35 +11:00
Matt-Yorkley
bd9bed7323 Update schemas for relationships 2022-03-02 11:59:35 +11:00
Matt-Yorkley
2e59812bc1 Refactor to make more use of schema refs, and regenerate swagger file 2022-03-02 11:59:33 +11:00
Matt-Yorkley
d87e1805af Add relationships to resource serializers 2022-03-02 11:58:04 +11:00
Matt-Yorkley
d66d6d6bd6 Update use of links on relationships 2022-03-02 11:58:04 +11:00
Matt-Yorkley
3dbf00f302 Add pagination with Pagy using structure from JSON:API specification 
https://jsonapi.org/examples/#pagination

Update schema for collections rendered with pagination data
 2022-03-02 11:58:04 +11:00
Matt-Yorkley
c102ce8e7e Add RequestTimeout concern 2022-03-02 11:58:04 +11:00
Matt-Yorkley
8e61428cce Add 401 Unauthorized response test 2022-03-02 11:58:04 +11:00