7396 Commits

Author	SHA1	Message	Date
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
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	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
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
luisramos0	8fb103ce8d	Fix new_product div in new product page	2018-12-08 14:53:50 +00:00
Maikel Linke	cac4fa4816	Use I18n.t instead of Spree's JS t function	2018-12-07 23:38:05 +11:00
haseleyi	3f6e96dd5d	Fix comment	2018-12-06 14:07:45 -08:00
haseleyi	4a0744dd94	Add comment to explain hard-coded link	2018-12-06 11:49:39 -08:00
Maikel	da6dc20fcf	Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs ... [Spree Upgrade] Fix send confirmation instructions specs	2018-12-06 16:24:40 +11:00
Maikel	883e9bbdd8	Merge pull request #3166 from luisramos0/2-0-orders-tab-without-shipments ... [Spree Upgrade] Remove shipments option from orders tab (gone in spree 2)	2018-12-06 15:39:14 +11:00
Maikel	1b94b10bb0	Merge pull request #3171 from luisramos0/2-0-var-over-hide ... [Spree Upgrade] Remove hide class from the hide button in the inventory list	2018-12-06 15:21:34 +11:00
haseleyi	75277e92e4	Lazy-load the translations for images step of registration	2018-12-05 11:36:27 -08:00
luisramos0	460e010408	Removed shipments from orders tab. This option is removed in spree 2	2018-12-05 11:38:16 +00:00
Pau Pérez Fabregat	72a4b4f8e2	Merge pull request #3158 from luisramos0/2-0-vos-scoping ... [Spree Upgrade] Scopes variants on order completion and on changes to completed orders	2018-12-05 12:12:49 +01:00
Pau Perez	5845f80af0	Remove commented out code ... Because git keeps it for you.	2018-12-05 10:05:39 +01:00
Pau Pérez Fabregat	3b56212290	Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1 ... Remove frontoffice enterprises n+1	2018-12-05 08:12:19 +01:00
Pau Pérez Fabregat	e5a267f4c2	Merge pull request #2735 from luisramos0/cookies_colors ... Moved definition of colors in the cookies modal and banner colors to common darkswarm/base/colors	2018-12-05 08:06:58 +01:00
haseleyi	94d12217de	Fix untranslated buttons at image step of registration modal	2018-12-04 21:30:42 -08:00
Maikel	a2c8bea147	Merge pull request #3147 from luisramos0/2-0-vos ... [Spree Upgrade] Adapt variant overrides to spree 2	2018-12-05 10:50:20 +11:00
haseleyi	e863c3dec8	Fix broken link in register call partial	2018-12-04 10:23:46 -08:00
luisramos0	02d0b7e88c	Improve comment on VariantStock#move	2018-12-04 15:25:38 +00:00
luisramos0	7f7e7ea65e	Remove hide class from the hide button in the inventory list ... The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it	2018-12-04 10:55:55 +00:00
Maikel	60c8147391	Merge pull request #3164 from luisramos0/2-0-stable-dec-3rd ... [Spree Upgrade] Merging master into 2-0-stable (first run in Dec2018)	2018-12-04 13:38:02 +11:00