luisramos0
d44c4778e1
Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read
2018-12-24 16:39:06 +00:00
Pau Pérez Fabregat
1ab50798fe
Merge pull request #3189 from luisramos0/3043-i18n-emails
...
Make all mailers use appropriate locale when sending emails
2018-12-24 14:59:04 +01:00
luisramos0
429e513a77
Improve line_item code by moving order.shipment reload to a line_item after_destroy hook
2018-12-23 09:15:18 +00:00
luisramos0
b83ec8d357
Add order.shipments reload to line_item.update_inventory. This is necessary when destroying line items as update_inventory may delete the shipment from the order
2018-12-23 00:23:49 +00:00
luisramos0
26b5250f2c
Fix line item destroy by forcing quantity to zero and update_inventory before_destroy so that the variant is restocked
2018-12-22 23:27:27 +00:00
luisramos0
7155f28acf
Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details
2018-12-21 15:13:43 +00:00
luisramos0
6c70998b64
Move StockLocation.fill_status to VariantStock so we can easily override it
2018-12-21 11:33:07 +00:00
luisramos0
17ced61b3d
Override Spree::Variant.in_stock? in VariantStock so that we don’t depend on Spree::Stock::Quantifier
2018-12-21 11:33:07 +00:00
luisramos0
1835d97013
Adapt line_item.sufficient_stock? to spree 2
2018-12-21 11:33:07 +00:00
luisramos0
d641705053
Add variant scoping to availability_validator_decorator by using line_item.scoper and moving Spree::Stock::Quantifier.can_supply? to VariantStock so that it becomes overridable
2018-12-21 11:33:07 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
luisramos0
c1aeb2e9a3
Improve naming in availability_validator_decorator and cover it with tests
2018-12-20 14:26:34 +00:00
luisramos0
bc22b0a58e
Fix capping quantity to stock levels by always validating line items with quantity zero
...
Stock::Quantifier.can_supply? returns false for an input of zero when stock level is negative
2018-12-20 14:26:34 +00:00
luisramos0
3085e15961
Fix order factory by making line_item.skip_stock_check work in spree 2
2018-12-20 14:26:34 +00:00
luisramos0
88b1bb61d6
Fix availability validator to include inventory_units in it's validation
2018-12-20 14:26:34 +00:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
Maikel Linke
a978e992bf
Remove tax_rates shortcut from adjustment
...
Becoming less dependent on Spree, using our own namespace, keeping
decorators small.
2018-12-19 14:42:38 +11:00
Maikel Linke
fc1b182275
Simplify method complexity and comply with rubocop
2018-12-19 14:31:29 +11:00
Maikel Linke
3169a384ba
Find approximate tax rate if no other is found
...
There are several cases in which a tax rate is not associated with an
adjustment. We find the closest one for reporting here. It is not a good
solution, but a workaround introduced for reporting:
https://github.com/openfoodfoundation/openfoodnetwork/pull/1496
2018-12-19 14:31:29 +11:00
Maikel Linke
a341561446
Move tax rate finding into service and spec it
...
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Maikel
84f2f9af3c
Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
...
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
luisramos0
5e960512ac
Set user locale on user registrations #create
...
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
2018-12-18 15:30:01 +00:00
luisramos0
a9222665b8
Refactor user registrations controller, early return to reduce indentation
2018-12-18 15:26:49 +00:00
Pau Pérez Fabregat
1876ec42dc
Merge pull request #3201 from kevinchristianson/add-missing-stars
...
Add missing 'required field' stars in new product form
2018-12-17 10:36:51 +01:00
Pau Pérez Fabregat
554d650b8c
Merge pull request #3176 from kevinchristianson/button-translation-fix
...
Fix untranslated buttons at image step of registration modal
2018-12-17 10:36:07 +01:00
Pau Pérez Fabregat
2deffb9c9f
Merge pull request #3076 from Matt-Yorkley/orders_checkboxes
...
Fix checkbox values on orders page
2018-12-17 10:35:46 +01:00
Luis Ramos
dc6509aa83
use association on updates rather than #find
...
Co-Authored-By: sauloperez <saulopefa@gmail.com >
2018-12-17 10:31:52 +01:00
Pau Pérez Fabregat
fe0c56c800
Merge pull request #3174 from kevinchristianson/footer-url-fix
...
Fix broken registration link in footer
2018-12-14 15:42:08 +01:00
Pau Perez
be6c8be07a
Handle soft deleted products when refreshing cache
...
Since cd3add960e Spree soft-deletes products and as such the models not
destroyed but updated setting a value for the `deleted_at` field.
This turns what used to be deletes into updates thus triggering AR's
update callbacks instead of the destroy ones. As a result, this bypasses
the logic to refresh the products cache on destroy and hits the
`after_save` callback.
Furthermore, since act_as_paranoid (the soft-delete gem Spree uses) uses
a default scope to avoid retrieving soft-deleted records we need to
purposefully fetch them in order to refresh the cache.
2018-12-14 15:13:06 +01:00
Maikel
24ca66bd71
Merge pull request #3207 from luisramos0/2-0-insuf-stock-transl
...
[Spree Upgrade] Add missing spree translations related to insufficient stock
2018-12-14 12:05:06 +11:00
Maikel
1ed880e353
Merge pull request #3206 from coopdevs/fix-redirection-on-admin-products-specs
...
[Spree Upgrade] Fix redirection on admin products specs
2018-12-14 11:59:21 +11:00
Maikel
f0d3992511
Merge pull request #3203 from luisramos0/2-0-fix-prod-images-delete
...
[Spree Upgrade] Fix product properties and images deletion
2018-12-14 11:54:05 +11:00
Pau Pérez Fabregat
64e41712c6
Merge pull request #3130 from coopdevs/extract-restart-checkout
...
Extract restart checkout
2018-12-12 17:12:53 +01:00
luisramos0
5183c90c89
Add missing spree translations related to insufficient stock
2018-12-12 15:34:48 +00:00
luisramos0
47be452ca0
Make ProductsController#create and #update work by not mass-assigning the provided on_hand and on_demand values and set them in product variant after the product is created
2018-12-12 12:10:29 +00:00
luisramos0
66e69edca4
Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand=
2018-12-12 12:10:25 +00:00
Pau Perez
28cb1bf687
Clarify nasty boolean logic on method
2018-12-12 12:57:23 +01:00
luisramos0
4b74e50353
Make ProductsController#bulk_update work by making ProductSet#create_variant not mass-assigning the provided on_hand and on_demand values and set them after each variant is created
2018-12-11 15:18:00 +00:00
luisramos0
b5379a204b
Fix deletion of product images
2018-12-11 15:10:26 +00:00
luisramos0
e274442d77
Cover i18nhelper.valid_locale and user mailer with tests related to localized emails
2018-12-11 11:16:50 +00:00
Maikel
1819fc8493
Merge pull request #3199 from luisramos0/2-0-stable-dec-10th
...
[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)
2018-12-11 18:50:24 +11:00
Pau Pérez Fabregat
7834fa4d00
Merge pull request #3190 from luisramos0/2-0-new-product
...
[Spree Upgrade] Fix "new product" page specs and an html issue
2018-12-11 08:35:26 +01:00
haseleyi
835617159e
Add missing 'required field' stars in new product form
2018-12-10 18:02:39 -08:00
Maikel
d63ae792b3
Merge pull request #2775 from luisramos0/2-0-checkout-ship-method
...
[Spree Upgrade] Handle shipping_method_id in checkout
2018-12-11 11:59:03 +11:00
Matt-Yorkley
0c5ac99e0f
Fix multiple results with 'inventory_items_shipment_id_null' ransack query
...
The q['inventory_items_shipment_id_null'] search element was generating duplicates where there were multiple line items on an order that were ready to be shipped, with id = null
2018-12-10 20:48:53 +00:00
Matt-Yorkley
d48774e3a2
Add comment
2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974
Fix checkbox values on orders page
2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
luisramos0
4f4fc00549
Improve code, specs and comments in the shipping_method selection process in the checkout controller
2018-12-09 20:05:10 +00:00
