raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-23 01:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 16 Branches 454 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
feaf16d878 Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases 2018-10-16 20:59:34 +01:00
luisramos0
98161daa90 Refactor duplicated distributors association in payment_method and gateway to a concern 2018-10-16 20:27:22 +01:00
fabricio.albarnaz
419493f153 Move instagram regex to an method to fix codeclimate 2018-10-16 16:09:15 -03:00
fabricio.albarnaz
8e4adbd23a Add more test cases 2018-10-16 15:34:46 -03:00
fabricio.albarnaz
93a051bf5a Regex ajust 2018-10-16 15:33:10 -03:00
Pau Pérez Fabregat
601e0b927a Merge pull request #2816 from luisramos0/2-0-adjust-enterprise-fees-spec-fix-aplicator 
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - enterprise_fee_aplicator
 2018-10-16 19:47:10 +02:00
Pau Pérez Fabregat
54f0ccab93 Merge pull request #2861 from luisramos0/2-0-stable-spree-revision 
[Spree Upgrade] Update spree 2-0-4-stable revision used to pick up latest commits
 2018-10-16 19:41:08 +02:00
Luis Ramos
3e4f92fe92 Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix 2018-10-16 17:33:33 +01:00
Pau Pérez Fabregat
c99fec44da Merge pull request #2824 from luisramos0/2-0-order-spec 
[Spree Upgrade] Fix taxes tests in models/spree/order_spec
 2018-10-16 18:09:33 +02:00
Pau Pérez Fabregat
f2fe3c8cff Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix 
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate
 2018-10-16 18:02:21 +02:00
luisramos0
b3c56e6823 Duplicated payment method distributors association to gateway. This fixes the inheritance problem found in stripe gateway 
See PR 2780 for more details
 2018-10-16 16:55:18 +01:00
Pau Pérez Fabregat
db9669b4ce Merge pull request #2817 from coopdevs/remove-reference-to-on-demand 
[Spree Upgrade] Remove on_demand from Product serializers
 2018-10-16 17:52:42 +02:00
Luis Ramos
faf8322c59 Merge pull request #2785 from luisramos0/2-0-order-updater-fix 
[Spree Upgrade] Fix order_updater_spec by using create (instead of build) in shipment
 2018-10-16 16:43:42 +01:00
luisramos0
570016463b Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories 2018-10-16 16:37:36 +01:00
Pau Pérez Fabregat
afe1d7caef Merge pull request #2863 from luisramos0/2-0-stable-oct 
[Spree Upgrade] Merging master into 2-0-stable (one month of commits in master)
 2018-10-16 17:09:56 +02:00
Pau Pérez Fabregat
590091c42a Merge pull request #2842 from Matt-Yorkley/pi/missing_variable 
Fix missing local variable in EntryProcessor
 2018-10-16 13:19:23 +02:00
Maikel Linke
8fb81bb6a7 Configure Geocoder with API key as required by Google 2018-10-16 16:49:52 +11:00
Maikel Linke
61797fff56 Restrict deletion of address explicitely 
Enterprises have an `address_id` which must point to a valid
`Spree::Address`. As Rubocop suggested, I restricted the deletion of
addresses when they are still associated to an enterprise.

Without declaring `dependent: :restrict`, trying to delete the address
would raise `ActiveRecord::InvalidForeignKey`. Now it is more specific
and raises `ActiveRecord::DeleteRestrictionError`.

I didn't find code rescuing the InvalidForeignKey when deleting addresses. I
actually think that we never delete addresses. So this change should not
have any impact on the execution.
 2018-10-16 15:18:44 +11:00
Maikel Linke
a8705ca179 Simplify address methods 2018-10-16 14:49:36 +11:00
Maikel Linke
5021ed9c69 Simplify by using Rails tools 2018-10-16 14:49:35 +11:00
Maikel Linke
34849c441a Reduce complexity and duplication 2018-10-16 14:48:12 +11:00
Maikel Linke
c4437a6437 Style address decorator 2018-10-16 14:48:12 +11:00
Maikel Linke
b109f6d78c Remove temporary reporting code 2018-10-16 14:48:12 +11:00
fabricio.albarnaz
02bc134c59 Change befor save check to format validation 2018-10-15 17:51:33 -03:00
dependabot[bot]
dc6c8ec455 Bump figaro from 0.7.0 to 1.1.1 
Bumps [figaro](https://github.com/laserlemon/figaro) from 0.7.0 to 1.1.1.
- [Release notes](https://github.com/laserlemon/figaro/releases)
- [Changelog](https://github.com/laserlemon/figaro/blob/master/CHANGELOG.md)
- [Commits](https://github.com/laserlemon/figaro/compare/v0.7.0...v1.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-15 19:14:26 +00:00
luisramos0
87cd73ddba Merge branch 'master' into 2-0-stable-oct 2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat
f8bccda6ab Merge pull request #2847 from Matt-Yorkley/emails/validation 
Emails/validation
 2018-10-15 15:54:41 +02:00
Pau Perez
a5a2cb8ea7 Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up" 
This reverts commit fa689b6607, reversing
changes made to 2aeed9763c.
 2018-10-15 15:48:48 +02:00
Pau Pérez Fabregat
8946fe3ce8 Merge pull request #2829 from Matt-Yorkley/bi/results_per_page 
Add per_page controls to admin orders index
 2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
0e4a3dbc26 Merge pull request #2845 from coopdevs/fix-invalid-variant-creation 
Fix invalid variant creation
 2018-10-15 12:16:39 +02:00
Pau Pérez Fabregat
fa689b6607 Merge pull request #2856 from luisramos0/2-0-adjust-clean-up 
[Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec
 2018-10-15 11:13:46 +02:00
Pau Pérez Fabregat
fe149967e4 Merge pull request #2521 from luisramos0/cookies_in_engine 
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
 2018-10-15 10:03:30 +02:00
luisramos0
f133524a9c Remove useless comment from spec factories 2018-10-12 23:09:36 +01:00
luisramos0
4380ff7bd7 Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4) 2018-10-12 23:09:36 +01:00
luisramos0
a5522b90f6 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created 2018-10-12 23:09:35 +01:00
luisramos0
bd31348b94 Improve docs and readability on tax_rate_decorator 2018-10-12 23:09:35 +01:00
luisramos0
5693f44f5e Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment 2018-10-12 23:09:35 +01:00
Matt-Yorkley
fcff835922 Update results on dropdown select 2018-10-12 17:06:42 +01:00
Matt-Yorkley
a2828ea305 Use :for_hubs scope 2018-10-12 17:00:19 +01:00
Matt-Yorkley
123d1963ad Remove duplicate method 2018-10-12 17:00:19 +01:00
Matt-Yorkley
3cb43121d5 Refactor long lines for new character limit 2018-10-12 17:00:18 +01:00
Matt-Yorkley
8fcaa54de7 Update CSV templates 2018-10-12 16:57:13 +01:00
Matt-Yorkley
bd4f0507ce Adjustments for new Settings and ResetAbsent classes 2018-10-12 16:57:13 +01:00
Matt-Yorkley
1c85de6f58 Use producer and distributor for field names 2018-10-12 16:57:13 +01:00
Matt-Yorkley
2c9dc8899a Update fields in specs 2018-10-12 16:57:13 +01:00
Matt-Yorkley
5c2b5377bc Assign supplier_id when saving new product to products list 2018-10-12 16:57:13 +01:00
Matt-Yorkley
e7a909e828 Rename supplier to enterprise 2018-10-12 16:57:13 +01:00
Matt-Yorkley
8a0a33deec Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit 
Increase rubocop line limit to 100
 2018-10-12 16:52:37 +01:00
luisramos0
1b6f7485b8 Update spree 2-0-4-stable revision used to pick up latest commits 2018-10-12 12:05:18 +01:00
luisramos0
3b6d29968d Fix spree/models/adjustment_spec rubocop issues 2018-10-11 23:02:17 +01:00