11096 Commits

Author	SHA1	Message	Date
Matt-Yorkley	d8b795ebee	Merge pull request #6679 from Matt-Yorkley/soft-delete-enterprise-fees ... Soft-delete Enterprise Fees	2021-01-21 19:57:29 +01:00
Andy Brett	70f30f5224	Merge pull request #6658 from andrewpbrett/item-counter-fix ... Further fix #5989 (Item counter accepts values higher than the available stock)	2021-01-21 10:56:18 -08:00
Andy Brett	77419a1e4b	Merge pull request #6675 from cillian/single-new-product-view ... Remove ability to create new product from products page, use /admin/products/new instead.	2021-01-20 19:23:33 -08:00
Andy Brett	e31d566f7f	Merge pull request #6283 from luisramos0/sets ... Move sets out of app/models to app/services/sets	2021-01-20 19:22:15 -08:00
Andy Brett	ca37976661	Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component ... Create a reusable "loading spinner" component	2021-01-20 19:21:31 -08:00
Andy Brett	1d4fa2983c	Merge pull request #6466 from Matt-Yorkley/package-optimisation ... Optimise Shipment#to_package	2021-01-20 19:20:56 -08:00
Matt-Yorkley	6a9505cf67	Ensure adjustments can access soft-deleted originators ... Note: originator is generally an EnterpriseFee or a TaxRate	2021-01-19 16:46:14 +00:00
Matt-Yorkley	c4a8a38c8d	Soft-delete enterprise fees ... These objects can hold critical information related to adjustments and tax categories. If they are hard-deleted we lose vital data that's needed by associated records.	2021-01-19 16:46:14 +00:00
Pau Pérez Fabregat	8b01c9c8ba	Merge pull request #6279 from luisramos0/base_controller ... Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController	2021-01-19 15:52:47 +01:00
Luis Ramos	fc40775ca8	Make paypal controller inherit from base controller and not from old store controller	2021-01-18 23:33:05 +00:00
Maikel	334e270a11	Merge pull request #6552 from Matt-Yorkley/adjustments-order-association ... [Adjustments] Associate all adjustments with an order	2021-01-19 08:43:13 +11:00
Luis Ramos	4060e7debf	Replace usages of Spree::BaseController with ApplicationController	2021-01-15 21:59:16 +00:00
Luis Ramos	7a22367b4a	Make controllers use ::Basecontroller instead of StoreController	2021-01-15 21:59:16 +00:00
Luis Ramos	23e6048bde	Merge StoreController with BaseController	2021-01-15 21:59:16 +00:00
Luis Ramos	ff8a81cee7	Remove includes already present in parent ApplicationController	2021-01-15 21:59:16 +00:00
Luis Ramos	0eab1b2339	Merge Spree::BaseController with ApplicationController	2021-01-15 21:59:16 +00:00
Matt-Yorkley	5593da2928	Delete dead code #update_hooks ... These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI	2021-01-15 16:49:45 +00:00
Pau Pérez Fabregat	f240402c43	Merge pull request #6654 from Matt-Yorkley/update-without-callbacks ... Remove #update_attributes_without_callbacks	2021-01-15 12:24:42 +01:00
Cillian O'Ruanaidh	79668e06a7	Remove ability to create new product from products page, use /admin/products/new instead. ... It's simpler if there is just one place to add a new product. Closes #6650 This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.	2021-01-15 10:24:50 +00:00
Andy Brett	7ca81f45d0	Merge pull request #6641 from Matt-Yorkley/shipping-method-soft-deletion ... Ensure ShippingMethod is correctly using soft-deletion	2021-01-14 11:53:19 -08:00
Andy Brett	18dcbbd892	Merge pull request #6613 from Matt-Yorkley/variant-override-serialization ... Don't serialize all variant override objects where they are not needed	2021-01-14 10:59:11 -08:00
Andy Brett	81ea71af94	Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field ... remove asterisk on 'display as' field unit value for a product	2021-01-14 10:09:15 -08:00
Pau Pérez Fabregat	929ae82e00	Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal ... Bye Bye Spree Paypal	2021-01-14 18:16:44 +01:00
Pau Pérez Fabregat	9689fe2edf	Merge pull request #6384 from andrewpbrett/fix-product-descriptions ... correctly display '&' and ' ' in product descriptions	2021-01-14 17:00:16 +01:00
Luis Ramos	fd0bba19a7	Adapt enterprises code and specs to new namespace Sets::EnterpriseSet	2021-01-14 09:41:07 +00:00
Luis Ramos	ed0441dc41	Fix a few more rubocop issues	2021-01-14 09:41:07 +00:00
Luis Ramos	19b12092a0	Fix rubocop issues and adapt exceptions file	2021-01-14 09:41:07 +00:00
Luis Ramos	5d6d7f7ad0	Adapt enterprise fees code and specs to new namespace of Sets::EnterpriseFeeSet	2021-01-14 09:41:07 +00:00
Luis Ramos	96a351ad0e	Adapt usage of Sets to their new location	2021-01-14 09:41:07 +00:00
Luis Ramos	187b4a1fc2	Add Sets namespace to each set file	2021-01-14 09:41:07 +00:00
Luis Ramos	8e65d29b02	Move sets to specific services namespace	2021-01-14 09:41:07 +00:00
Pau Pérez Fabregat	9db4f9be15	Merge pull request #6634 from Matt-Yorkley/jobs-cleanup ... Jobs cleanup	2021-01-14 10:08:15 +01:00
Maikel	168958311a	Merge pull request #6656 from Matt-Yorkley/payment-identifier ... Fix payment identifier generation	2021-01-14 17:34:38 +11:00
Maikel	fbda1fffd7	Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment ... Dead code: #has_available_payment	2021-01-14 17:33:07 +11:00
Maikel	50472d18e0	Merge pull request #6642 from coopdevs/doc-customer-serializer ... Doc customer serializer	2021-01-14 17:28:34 +11:00
Maikel	14842f52fc	Merge pull request #6633 from Matt-Yorkley/inverse-of ... Adding inverse_of	2021-01-14 17:25:51 +11:00
Andy Brett	bbd7fd0350	handle nil product descriptions	2021-01-13 20:57:27 -08:00
Andy Brett	8c4d12a501	limit item counter to max quantity available even if amount is manually filled in	2021-01-13 16:23:41 -08:00
Matt-Yorkley	5f2dc38241	Merge pull request #6098 from brymut/item-counter-fix ... Fix #5989 Item counter accepts higher amount than available stock	2021-01-13 22:33:08 +01:00
Andy Brett	c29d57b54e	Merge pull request #6369 from Matt-Yorkley/broken-variants ... Fix variant data inconsistencies	2021-01-13 11:10:44 -08:00
Pau Pérez Fabregat	6e48607760	Merge pull request #6629 from jibees/6199-alignment-readyfor-ipad ... 6199 adjust alignment on the Order Cycle component on ipad	2021-01-13 19:20:14 +01:00
Matt-Yorkley	18c9e16303	Fix payment identifier generation ... Upstream fix from Spree 2.2. See: 4e747187d7	2021-01-13 17:37:22 +00:00
Matt-Yorkley	561cf23dc1	Remove #update_attributes_without_callbacks ... This is a hacky Spree method that's removed in Spree 2.2 See: 7deba6a152	2021-01-13 16:02:21 +00:00
Matt-Yorkley	8d338a06f3	Delete dead code #has_available_payment ... This is removed in Spree 2.2, as it serves no purpose. See: 0617bdce30	2021-01-13 15:48:02 +00:00
Pau Perez	acd4dddf1b	Doc how balance_value works ... [skip ci]	2021-01-13 12:50:41 +01:00
Jean-Baptiste Bellet	dcbf02bc47	remove asterisk on 'display as' field unit value for a product ... as it's not a mandatory field	2021-01-13 11:30:08 +01:00
Andy Brett	5723a79409	check for content.present?	2021-01-11 21:21:24 -08:00
Matt-Yorkley	ca4de40fa2	Associate all adjustments with an order ... This change is introduced in the adjustments updates from Spree 2.2 and used heavily in new scopes and methods (not included here).	2021-01-11 17:35:35 +00:00
Jean-Baptiste Bellet	8399b82bfd	rename component to spinner ... A name for a "thing" rather a state	2021-01-11 16:49:56 +01:00
Matt-Yorkley	46ff247bc9	Ensure ShippingMethod#destroy is using soft-deletion ... 25f5c2daf8 We've already applied some of the changes in this commit during previous Spree upgrade work, but there were a couple of bits missing.	2021-01-11 15:46:38 +00:00