luisramos0
c0a095ffaf
Improve variant_overrides_spec variable names
2018-12-21 11:33:07 +00:00
luisramos0
4f79fd5be0
Improve availability validator spec readability and remove unnecessary expect statements
2018-12-21 11:19:12 +00: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
Luis Ramos
0aaa41ced0
Merge pull request #3228 from luisramos0/2-0-stable-dec-18th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)
2018-12-19 09:30:57 +00:00
Maikel
4201549992
Merge pull request #3219 from luisramos0/2-0-payment-ctrl
...
[Spree Upgrade] Adapt payment controller spec to spree 2
2018-12-19 15:23:11 +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
Pau Pérez Fabregat
0c8cb8abe2
Merge pull request #3218 from coopdevs/handle-soft-deleted-products-in-serializer-spec
...
Handle soft deleted products in serializer spec
2018-12-18 08:59:36 +01:00
Maikel
f36c045425
Merge pull request #3213 from kristinalim/fix-rubocop_block_length_ignore_it
...
Ignore `it` in Rubocop BlockLength
2018-12-18 11:42:14 +11:00
Matt-Yorkley
d34b8c52b8
Update all locales with the latest Transifex translations
2018-12-17 11:17:54 +00:00
Pau Pérez Fabregat
54775f6b6a
Merge pull request #3221 from zvkemp/skylight-1.7.2
...
update Skylight to 1.7.2
2018-12-17 10:44:16 +01: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
zvkemp
d3d43c8808
update Skylight to 1.7.2
2018-12-14 12:25:41 -08:00
luisramos0
a5bf7a1f35
Adapt payment controller spec to spree 2
...
In spree 2, since 5ed6015916
2018-12-14 16:04:19 +00: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 Pérez Fabregat
34a42cc592
Merge pull request #3181 from luisramos0/roadie-rails-upgrade
...
Bump roadie-rails from 1.0.3 to 1.1.1
2018-12-14 15:26:25 +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
Pau Perez
51e277a183
Make test setup more readable
2018-12-14 15:12:41 +01:00
Kristina Lim
d0d10eba4b
Ignore it method in Rubocop BlockLength
2018-12-14 17:44:19 +08: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
2eb6d0a047
Merge pull request #3185 from openfoodfoundation/dependabot/bundler/oj-3.7.4
...
Bump oj from 3.6.10 to 3.7.4
2018-12-13 18:10:55 +01:00
Maikel
eb016c0471
Merge pull request #3145 from openfoodfoundation/dependabot/bundler/i18n-js-3.1.0
...
Bump i18n-js from 3.0.11 to 3.1.0
2018-12-13 10:58:22 +11:00
Maikel
eedba7a35b
Merge pull request #3197 from luisramos0/2-0-product-stock
...
[Spree Upgrade] Adapt Product level stock management to Spree 2
2018-12-13 10:53:46 +11:00
Pau Pérez Fabregat
d317603872
Merge pull request #3187 from openfoodfoundation/dependabot/bundler/rspec-rails-3.8.1
...
Bump rspec-rails from 3.7.2 to 3.8.1
2018-12-12 17:14:05 +01: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
Pau Perez
43cacfc2fc
Fix redirection on admin/products controller specs
...
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.
Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
2018-12-12 13:10:39 +01: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
181915c63a
Fix deletion of product properties
2018-12-11 15:53:40 +00: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
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
e711c5ed03
Add spec for search filters
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
