raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-20 04:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,135 Commits 16 Branches 458 Tags
157bdd9f3d20cd1caa2487393e2bbd95adca0dce
Commit Graph

25135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
05bb75db00 Merge pull request #6089 from luisramos0/seed_data 
[Bye bye spree] Prepare seed data for bye bye spree
 2020-10-16 11:55:27 +01:00
Cillian O'Ruanaidh
2cc751cb30 When resetting stock to 0 on absent products in product import also reset the on demand setting 
Before when you imported products and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant was also set to be on demand the product would still be available for sale. This change makes sure the on demand setting is turned off too.

Fixes #6064.
 2020-10-16 11:38:49 +01:00
Luis Ramos
487aaf4862 Extract stub to StripeHelper 2020-10-16 11:12:44 +01:00
Luis Ramos
f13ebf8f21 DRY StripeHelper 2020-10-16 11:09:52 +01:00
Luis Ramos
7e80ddf1e5 Add step to checkout with the previously saved card 2020-10-16 10:24:49 +01:00
Luis Ramos
7efc52075e First attempt at adding a spec to checkout and save a credit card 2020-10-16 09:26:19 +01:00
Luis Ramos
22bd0f3a52 Merge pull request #6187 from jhsu802701/spec_support_request_stripe_helper 
Updated RuboCop (spec/support/request/stripe_helper.rb)
 2020-10-16 08:49:17 +01:00
Luis Ramos
94713522e5 Merge pull request #6189 from jhsu802701/update_db_schema 
Updated db/schema.rb by running database migrations
 2020-10-16 08:40:18 +01:00
Luis Ramos
49947614b3 Merge pull request #6190 from jhsu802701/rubocop_calculator_factory 
Updated spec/factories/calculator_factory.rb for RuboCop
 2020-10-16 08:36:53 +01:00
Jason Hsu
c39e238e83 Updated spec/factories/calculator_factory.rb to remove unnecessary space; reduces number of RuboCop offenses from 91 to 90 2020-10-16 00:08:19 -05:00
Maikel Linke
6c1139c296 Add script to draft release notes 2020-10-16 16:03:26 +11:00
Jason Hsu
0119d9d0eb Updated db/schema.rb by running bundle exec rake db:migrate 2020-10-15 23:56:43 -05:00
Maikel Linke
3679e0fac9 Copy all translations from Transifex 2020-10-16 15:34:24 +11:00
Maikel
960da1e7e9 Merge pull request #6179 from openfoodfoundation/transifex 
Transifex
 2020-10-16 15:33:11 +11:00
Maikel
8c65498661 Merge pull request #5998 from andrewpbrett/shipping-per-pound 
Per-pound shipping calculator
 2020-10-16 15:27:57 +11:00
Maikel
07780c5663 Merge pull request #6146 from openfoodfoundation/dependabot/bundler/geocoder-1.6.4 
Bump geocoder from 1.6.3 to 1.6.4
 2020-10-16 15:26:41 +11:00
Jason Hsu
bdf0cb1364 Exclude spec/support/request/stripe_helper.rb from Metrics/ModuleLength cop; reduces number of offenses from 90 to 89 2020-10-15 23:25:32 -05:00
Matt-Yorkley
f260a2d114 Merge pull request #6141 from Matt-Yorkley/mobile-shops-list 
Make shops index page usable on mobile
 2020-10-16 03:21:32 +02:00
Matt-Yorkley
25ee38cb9a Merge pull request #6128 from luisramos0/stripe_bo 
Add feature specs to stripe payments in the BackOffice
 2020-10-16 02:53:42 +02:00
Matt-Yorkley
248633e14f Merge pull request #6161 from Matt-Yorkley/add-polish-momentjs 
Add polish translations with momentjs
 2020-10-16 01:49:51 +02:00
dependabot-preview[bot]
66cde06cf8 Bump i18n-js from 3.7.1 to 3.8.0 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-15 23:24:41 +00:00
dependabot-preview[bot]
4fa6070353 Bump activerecord-import from 1.0.6 to 1.0.7 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.6...v1.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-15 23:14:21 +00:00
Luis Ramos
6bacc2f627 Fix group_buy_report_spec by avoiding orders with duplicate line items 2020-10-15 18:33:56 +01:00
Luis Ramos
4c9e4ee926 Fix problem in calculator spec 
I am not sure why this started failing on this branch only and not in master but this fix is correct because line_items are created with order defined already, an order.reload is enough to load them into the order
 2020-10-15 17:19:39 +01:00
Matt-Yorkley
7de98e74b8 Use #setup_stripe helper in tests to ensure Stripe keys are present 2020-10-15 17:09:24 +01:00
Luis Ramos
5141723b21 Re-add restart checkout specs 
These were breaking because of the class_evals on the checkout_spec
 2020-10-15 16:06:27 +01:00
Luis Ramos
fb3f35100f Remove specs related to subsclassing the order class 
This is not something we will  do
 2020-10-15 16:06:27 +01:00
Luis Ramos
249b4d124f Remove more specs related to dynamic order checkout workflow 2020-10-15 16:06:27 +01:00
Luis Ramos
07b3c100e8 Remove code and specs related to dynamic checkout workflow, we have a static workflow defines in the Order class 2020-10-15 16:06:27 +01:00
Andy Brett
ca24068d37 use case-insensitive sql query 2020-10-15 07:55:19 -07:00
Transifex-Openfoodnetwork
5bd7000f58 Updating translations for config/locales/en_US.yml 2020-10-16 01:19:20 +11:00
Transifex-Openfoodnetwork
d9c107f282 Updating translations for config/locales/en_US.yml 2020-10-16 01:16:13 +11:00
Luis Ramos
6046b0f6e4 Fix typo 2020-10-15 14:54:42 +01:00
Luis Ramos
62a54e5f17 Add spec to cover stripe SCA refunds in the backoffice 2020-10-15 14:54:42 +01:00
Luis Ramos
bce81d27dd Move spec to end of file so we can extend this case with refunds and cancelations 2020-10-15 14:54:42 +01:00
Luis Ramos
a6ed003cb9 Extract redirect stub to stripe_helper 2020-10-15 14:54:42 +01:00
Luis Ramos
b341f593e7 Improve method names 2020-10-15 14:54:42 +01:00
Luis Ramos
59b4e425b6 Fix some rubocop issues 2020-10-15 14:54:42 +01:00
Luis Ramos
4ab2a8ddd1 Add spec to cover stripe payment that fails on card registration with a request/redirect for extra SCA authorization 2020-10-15 14:54:42 +01:00
Luis Ramos
a5dbdaf228 Add spec to cover stripe payment that fails on capture 2020-10-15 14:54:42 +01:00
Luis Ramos
76a9271d9e Add spec to cover payments in the backoffice for an order in the payment state 2020-10-15 14:54:42 +01:00
Luis Ramos
0178d3f1e6 Add spec that takes a stripe payment in the BO 2020-10-15 14:54:42 +01:00
Luis Ramos
cfed6a7048 Split payments_spec so that we can add more stripe specific specs 2020-10-15 14:54:42 +01:00
Luis Ramos
c664181266 Update PULL_REQUEST_TEMPLATE.md 2020-10-15 14:39:20 +01:00
Luis Ramos
945ea476fc Merge pull request #6176 from openfoodfoundation/dependabot/bundler/timecop-0.9.2 
Bump timecop from 0.9.1 to 0.9.2
 2020-10-15 13:50:53 +01:00
Luis Ramos
9e4e72bec3 Merge pull request #6167 from jhsu802701/rubocop_spec_support_request 
Updated files in the spec/support/request directory for RuboCop compliance
 2020-10-15 13:48:12 +01:00
Daniel Santamaría
3fe7638dd6 Fix docker local environment setup 2020-10-15 12:28:07 +02:00
Pau Pérez Fabregat
981c17b6a5 Merge pull request #6169 from luisramos0/rubocop_refresh 
Refresh Rubocop exception files
 2020-10-15 12:06:41 +02:00
Pau Pérez Fabregat
55b6e7fa89 Merge pull request #6164 from openfoodfoundation/dependabot/bundler/webmock-3.9.2 
Bump webmock from 3.9.1 to 3.9.2
 2020-10-15 10:23:46 +02:00
Luis Ramos
d54ddacc05 Merge pull request #5887 from luisramos0/orders 
[Bye bye Spree] Bring models order, line_item and other related from spree_core
 2020-10-15 08:49:05 +01:00