14886 Commits

Author	SHA1	Message	Date
luisramos0	591efecde6	Make unit description field visible in the variant edit page even for products which variant_unit is items	2019-09-22 16:42:03 +01:00
luisramos0	24afa21885	Revert "Change products controller to clear variants unit description if variant_unit is items" ... This reverts commit 1a4e83d633.	2019-09-22 16:31:26 +01:00
luisramos0	cd6d34663e	Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0	2019-09-22 15:25:24 +01:00
luisramos0	c66e5fe1e9	Make subscription line items handle soft deleted variants ... This ensures subscription list page works. The variant can be removed from the subscription by the user in the edit subscription page	2019-09-22 14:59:59 +01:00
JASON KNOEPFLER	4ec8fcd3a6	Assign flash message var from conditional return	2019-09-21 08:10:58 -07:00
JASON KNOEPFLER	07e0951490	Change users#update email change flash alert	2019-09-20 10:35:25 -07:00
luisramos0	fc433ff8f0	Refactor ship methods controller destroy action: remove single action before_filter	2019-09-20 16:29:36 +01:00
luisramos0	8e33437fbb	MErge ship method controller decorator with the controller that came from spree	2019-09-20 15:59:24 +01:00
luisramos0	a5103c737d	Fix rubocop issues in ship methods controller from spree	2019-09-20 15:58:05 +01:00
luisramos0	37c8f42244	Bring shipping methods and categories controllers from spree_backend	2019-09-20 15:56:24 +01:00
luisramos0	0e8765636b	Bring tax_settings from spree_backend to ofn	2019-09-20 15:46:33 +01:00
luisramos0	4f9eee2682	Fix feature specs added from spree_backend in the configuration area	2019-09-20 15:43:55 +01:00
luisramos0	cc0dabcd1e	Convert spree/admin/tax_rates from erb to haml	2019-09-20 15:36:58 +01:00
luisramos0	e79c672263	Convert spree/admin/tax_categories from erb to haml	2019-09-20 15:36:54 +01:00
luisramos0	bc6f7934e0	Add spree_backend views related to admin/configuration menu that are missing in ofn	2019-09-20 15:35:49 +01:00
luisramos0	89029f46f9	Fix basic rubocop issues in newly added controller	2019-09-20 15:32:34 +01:00
luisramos0	144369e55f	Add tax related controllers from spree_backend related to config	2019-09-20 15:31:30 +01:00
luisramos0	c66579a22f	Fix simple rubocop issues in helper	2019-09-20 15:24:06 +01:00
luisramos0	9291bf5c82	Bring taxons_helper from spree	2019-09-20 15:24:06 +01:00
luisramos0	def9ab7c47	Convert spree/admin/taxons from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2a68d34fb0	Convert spree/admin/taxonomies from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2ce56aef2c	Add spree_backend views related to admin/configuration taxonomies that are missing in ofn	2019-09-20 15:23:45 +01:00
luisramos0	20f965731d	Fix basic rubocop issues in recently added controller from spree_backend	2019-09-20 15:14:34 +01:00
luisramos0	8378dce752	Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step	2019-09-20 15:13:45 +01:00
luisramos0	d7a4e3a896	Add taxonomies controller from spree_backend	2019-09-20 15:12:38 +01:00
luisramos0	4a83eca832	Fix feature specs added from spree_backend in the configuration area	2019-09-20 15:05:21 +01:00
luisramos0	32c1eecece	Convert spree/admin/zones from erb to haml	2019-09-20 15:01:06 +01:00
luisramos0	6d8c7a4bee	Fix minor detail in states and countries views	2019-09-20 14:57:48 +01:00
luisramos0	bd2045cad7	Convert spree/admin/states from erb to haml	2019-09-20 14:55:36 +01:00
luisramos0	e1c3d2442a	Convert spree/admin/countries from erb to haml	2019-09-20 14:55:10 +01:00
luisramos0	3df65d0463	Add spree_backend views related to admin/configuration menu that are missing in ofn	2019-09-20 14:54:55 +01:00
luisramos0	822a17f732	Fix basic rubocop issues in newly added controllers	2019-09-20 14:50:38 +01:00
luisramos0	ffde0307e2	Add controllers from spree_backend related to config	2019-09-20 14:50:01 +01:00
Luis Ramos	746c4f03f6	Merge pull request #4261 from jasonk357/3979-malformed-referer-error ... Guard against malformed request referer	2019-09-19 17:29:18 +01:00
Kristina Lim	3535c4d564	Merge pull request #4240 from Matt-Yorkley/backorder_to_the_future_2 ... Disentangle on_demand and backordered	2019-09-20 00:05:27 +08:00
luisramos0	bdb3dd5aaf	Fix long lines in app/serializers	2019-09-19 16:32:09 +01:00
luisramos0	25fbab2e37	Use memoized order method	2019-09-19 16:32:09 +01:00
luisramos0	a44a251d96	Remove duplicated attributes tag from all serializers to create consistency	2019-09-19 16:32:09 +01:00
luisramos0	2921ee19e1	Add api/order/{order_number} ednpoint and its new order detailed serializer	2019-09-19 16:32:09 +01:00
luisramos0	6796d91a07	Add some basic attributes to address and order serializers that will be used in the order show api endpoint	2019-09-19 16:32:09 +01:00
luisramos0	69afcf7510	Improve readability in order permissions	2019-09-19 16:32:09 +01:00
Luis Ramos	ed1c154b78	Merge pull request #4252 from luisramos0/remove_clear_ship_address ... On checkout of pickup orders, set ship_address to shipping_address_from_distributor instead of empty Spree::Address.default	2019-09-17 13:18:20 +01:00
Luis Ramos	e7e4508555	Merge pull request #4242 from Matt-Yorkley/another_cartastrophe ... Soft-delete price objects	2019-09-16 17:18:39 +01:00
Luis Ramos	46353be9a3	Merge pull request #4237 from coopdevs/unobfuscate-bulk-management-action ... Add implicit #bulk_management including filter	2019-09-15 12:15:11 +01:00
JASON KNOEPFLER	91a52ead58	Guard against malformed request referer	2019-09-14 09:13:44 -07:00
luisramos0	377b4a3755	Do not add ng-controller if main_ng_ctrl_name is not set	2019-09-11 10:36:19 +01:00
luisramos0	0c809b2911	Remove now unused override app_wrapper	2019-09-11 10:35:39 +01:00
luisramos0	33472014f1	Do not add main_ng_app_name if it is not defined	2019-09-11 10:32:30 +01:00
luisramos0	d038c27f1f	Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller	2019-09-11 10:32:30 +01:00
luisramos0	3d718d9738	Move admin layout body contents to a separate partial	2019-09-11 10:32:29 +01:00