Pau Perez
de31823151
Add #on_demand= to make product creation page work
...
We're bringing in the setter that got removed in Spree 2.0 so that we
can still pass an on_demand value from the product creation form.
However, we won't keep the getter to keep things simple. The frontend
seems to be checking the existence of variants anyway, so then it can
also check for product.master.on_demand and we avoid some logic on the
backend.
2018-11-08 11:41:58 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Matt-Yorkley
9011f5d9a2
Rescue ArgumentError and give user feedback
2018-11-07 18:48:08 +00:00
Matt-Yorkley
b5c6ecb45a
Explicitly use UTF-8 encoding when opening spreadsheet files
2018-11-07 16:50:24 +00:00
luisramos0
9490da329a
Move Calculator::Weight from models/open_food_network/calculator to models/calculator
2018-11-07 09:54:30 +00:00
luisramos0
bf55f50a7e
Fix rubocop warnings on weight and weight_spec
2018-11-07 09:54:30 +00:00
luisramos0
1ef04354fd
Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package)
2018-11-07 09:54:30 +00:00
Pau Pérez Fabregat
e635cfc9c1
Merge pull request #2901 from luisramos0/variants_including_master
...
[Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master
2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat
ad743a03ac
Merge pull request #2888 from luisramos0/backorders-line-items
...
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
2018-11-02 15:45:25 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Maikel
7609496df3
Merge pull request #2859 from albarnaz/instagram_pattern
...
Instagram pattern
2018-10-30 15:10:27 +11:00
Pau Pérez Fabregat
8a3f621b42
Merge pull request #2893 from luisramos0/deleted_products_break_inventory
...
Fix bug in inventory management page
2018-10-25 18:20:42 +02:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01:00
Pau Pérez Fabregat
9ef4852bd4
Merge pull request #2818 from nikobozi/refactor-variant-overrides-query
...
Move query from variant_overrides_controller to its model scope
2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat
a1bbf5328e
Merge pull request #2872 from mkllnk/2765-fix-geocoding
...
2765 Fix geocoding to display enterprises on map
2018-10-22 16:44:30 +02:00
luisramos0
92c7db2249
Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem
2018-10-20 23:43:33 +01:00
luisramos0
9079437284
Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted
2018-10-20 12:32:51 +01:00
luisramos0
5ae0ad87a7
Refactor EnterpriseRelationship before save hook: some renames and extract methods
2018-10-20 11:52:11 +01:00
luisramos0
c373d5ab33
Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method
2018-10-18 19:44:38 +01:00
luisramos0
a92e8c9923
Improve readability of shipment decorator
2018-10-18 10:54:21 +01:00
luisramos0
91f52d80c8
Fix problem in order and adjustment model specs by fixing the order.adjustment association
...
This fix was taken from spree 2.1 here 3fa44165c7
2018-10-18 10:53:00 +01:00
luisramos0
2ccbb87adc
Fix payment decorator bug
...
Payment line items must come from the order, payment does not have inventory_units
2018-10-18 10:53:00 +01:00
Maikel
3a2e52cc98
Merge pull request #2780 from luisramos0/2-0-stripe-factory
...
[Spree Upgrade] Fix Stripe connect factory
2018-10-18 14:54:28 +11: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
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03: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
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
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
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
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Pau Perez
a5a2cb8ea7
Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up"
...
This reverts commit fa689b66072aeed9763c
2018-10-15 15:48:48 +02:00
luisramos0
bd31348b94
Improve docs and readability on tax_rate_decorator
2018-10-12 23:09:35 +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
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
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
luisramos0
b7416e42f4
Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8)
2018-10-11 23:02:17 +01:00
fabricio.albarnaz
6ad32fb66d
Add check for instagram.com
2018-10-11 18:05:18 -03:00
