7262 Commits

Author	SHA1	Message	Date
Luis Ramos	0ea0016fc9	Merge pull request #2998 from coopdevs/adapt-product-on-demand ... [Spree Upgrade] Adapt product on demand	2018-11-08 19:21:46 +00:00
Luis Ramos	ed7c12bd26	Merge pull request #2997 from luisramos0/2-0-stable-nov-8th ... [Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)	2018-11-08 19:20:42 +00:00
Luis Ramos	30bca40ed0	Merge pull request #2996 from coopdevs/update-products-new-js-template ... [Spree Upgrade] Bring Spree changes on admin/products/new.js.erb	2018-11-08 12:13:47 +00:00
Pau Perez	de31823151	Add #on_demand= to make product creation page work ... We're bringing in the setter that got removed in Spree 2.0 so that we can still pass an on_demand value from the product creation form. However, we won't keep the getter to keep things simple. The frontend seems to be checking the existence of variants anyway, so then it can also check for product.master.on_demand and we avoid some logic on the backend.	2018-11-08 11:41:58 +00:00
luisramos0	fcdb5cd7af	Merge branch 'master' into 2-0-stable-nov-8th	2018-11-08 11:18:54 +00:00
Pau Perez	18c51dc596	Bring Spree changes on admin/products/new.js.erb ... We copied it from Spree to then append a little change on it. Since the original version changed in Spree 2.0 we need to update our copy.	2018-11-08 10:45:04 +00:00
luisramos0	9490da329a	Move Calculator::Weight from models/open_food_network/calculator to models/calculator	2018-11-07 09:54:30 +00:00
luisramos0	bf55f50a7e	Fix rubocop warnings on weight and weight_spec	2018-11-07 09:54:30 +00:00
luisramos0	1ef04354fd	Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package)	2018-11-07 09:54:30 +00:00
Luis Ramos	0c02e8c15f	Merge pull request #2981 from coopdevs/remove-commented-out-code ... Remove old commented out code	2018-11-06 16:06:59 +00:00
Pau Perez	71702af3c3	Have a single attributes list in serializer	2018-11-06 15:52:02 +00:00
Pau Perez	51155bb368	Remove old commented out code ... You know, git already keeps old code for us.	2018-11-06 14:23:15 +00:00
Pau Perez	26d95b7250	Fix long lines	2018-11-06 13:59:51 +00:00
Matt-Yorkley	d0b7b57017	Remove OrderSerializer#show_path and adjust to use #edit over #show	2018-11-06 11:07:14 +00:00
Matt-Yorkley	aaaec4777d	Remove admin order #show link from helper	2018-11-06 11:03:06 +00:00
Pau Pérez Fabregat	e635cfc9c1	Merge pull request #2901 from luisramos0/variants_including_master ... [Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master	2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat	b1f3fa14e5	Merge pull request #2880 from luisramos0/backorders ... [Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart	2018-11-02 15:47:02 +01:00
Pau Pérez Fabregat	ad743a03ac	Merge pull request #2888 from luisramos0/backorders-line-items ... [Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator	2018-11-02 15:45:25 +01:00
Maikel	3259b3ecf1	Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor ... Admin orders refactor	2018-11-02 16:57:28 +11:00
Pau Pérez Fabregat	e4b988c9a2	Merge pull request #2924 from kristinalim/fix-disable_hiding_of_offcanvas_upon_resize ... Disable hiding of hamburger menu upon resize <= 1024px width	2018-10-30 19:00:14 +01:00
Pau Pérez Fabregat	b35b24d4ae	Merge pull request #2914 from luisramos0/checkout-language-bug ... Fix multi lingual issue in cart and checkout: the user language selection was not being used	2018-10-30 17:46:37 +01:00
Pau Pérez Fabregat	8e602d453b	Merge pull request #2876 from luisramos0/subs-states-fix ... Fix bug in subscriptions address controller where country states were not correctly returned	2018-10-30 17:32:34 +01:00
Maikel	d63670d675	Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields ... [Product Import] Rename enterprise fields and update template	2018-10-30 15:11:02 +11:00
Maikel	7609496df3	Merge pull request #2859 from albarnaz/instagram_pattern ... Instagram pattern	2018-10-30 15:10:27 +11:00
Matt-Yorkley	443515dae4	Improve comment in index action	2018-10-29 10:34:05 +00:00
Matt-Yorkley	334eebeab1	Move json to API and strip index action	2018-10-26 21:38:57 +01:00
Matt-Yorkley	0bd67bd06a	Remove unnecessary Spree::Config fallback value	2018-10-26 21:38:57 +01:00
Matt-Yorkley	77251848ee	Refactor Spree::Admin::OrdersController	2018-10-26 21:38:57 +01:00
Pau Pérez Fabregat	8a3f621b42	Merge pull request #2893 from luisramos0/deleted_products_break_inventory ... Fix bug in inventory management page	2018-10-25 18:20:42 +02:00
Pau Pérez Fabregat	7cac4637fe	Merge pull request #2916 from luisramos0/date-transl-fix ... Add Portuguese and German to list of momentJS locales	2018-10-25 18:18:53 +02:00
luisramos0	90d7b7f4a0	Merge branch 'master' into 2-0-stable-oct-25	2018-10-25 14:28:58 +01:00
Kristina Lim	2cc594dc98	Proceed to hide off-canvas when resized to >1024px	2018-10-25 20:36:27 +08:00
Kristina Lim	14eaa49204	Disable hiding the off-canvas upon window resize. ... In some browsers for mobile devices, the address bar is automatically hidden when scrolling down the page. This is not workable if the height of the contents of the off-canvas exceeds the height of the screen, because the latter portion of the contents stays hidden to the user. https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js	2018-10-25 19:29:19 +08:00
Maikel	51a1787881	Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug ... Fix pagination conflict with LineItemsCtrl requests	2018-10-25 13:18:11 +11:00
Pau Pérez Fabregat	9ef4852bd4	Merge pull request #2818 from nikobozi/refactor-variant-overrides-query ... Move query from variant_overrides_controller to its model scope	2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat	9a06c1ef98	Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin ... [Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2	2018-10-23 18:59:01 +02:00
luisramos0	c9784a5eda	Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront	2018-10-23 17:53:08 +01:00
luisramos0	9d9f5d38d7	Fix multi lingual issue in cart and checkout: the user language selection was not being used	2018-10-23 14:10:48 +01:00
Matt-Yorkley	42c1584e6f	Fix pagination conflict with LineItemsCtrl requests	2018-10-22 18:13:56 +01:00
Pau Pérez Fabregat	a1bbf5328e	Merge pull request #2872 from mkllnk/2765-fix-geocoding ... 2765 Fix geocoding to display enterprises on map	2018-10-22 16:44:30 +02:00
luisramos0	d0d9038308	Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2	2018-10-22 11:24:01 +01:00
luisramos0	92c7db2249	Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem	2018-10-20 23:43:33 +01:00
luisramos0	653c67971f	Remove order admin page filter 'show only unfulfilled orders' as done on spree 2	2018-10-20 15:11:47 +01:00
luisramos0	9079437284	Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted	2018-10-20 12:32:51 +01:00
luisramos0	5ae0ad87a7	Refactor EnterpriseRelationship before save hook: some renames and extract methods	2018-10-20 11:52:11 +01:00
luisramos0	c373d5ab33	Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method	2018-10-18 19:44:38 +01:00
luisramos0	df36e0b344	In cart population, replace usage of global allow_backorders with variant.on_demand adapter	2018-10-18 18:37:09 +01:00
luisramos0	a92e8c9923	Improve readability of shipment decorator	2018-10-18 10:54:21 +01:00
luisramos0	91f52d80c8	Fix problem in order and adjustment model specs by fixing the order.adjustment association ... This fix was taken from spree 2.1 here 3fa44165c7	2018-10-18 10:53:00 +01:00
luisramos0	2ccbb87adc	Fix payment decorator bug ... Payment line items must come from the order, payment does not have inventory_units	2018-10-18 10:53:00 +01:00