7281 Commits

Author	SHA1	Message	Date
luisramos0	134b73d730	Improve VariantStock code by extracting stockitems.first to a separate method	2018-11-22 20:38:46 +00:00
Hugo Daniel	d7a148bb75	Fix checkout feature specs	2018-11-22 17:01:39 +01:00
Maikel	6835d24fbf	Merge pull request #3004 from luisramos0/2-0-mail-method-fix ... [Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=	2018-11-20 16:37:19 +11:00
luisramos0	bf32a21155	Allow adapted on_hand attr to be mass assigned in VariantStock. ... Without specifying it in `attr_accessible`, `#assign_attributes` won't work. See details in https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes and https://apidock.com/rails/ActiveRecord/Base/assign_attributes.	2018-11-19 10:05:17 +00:00
luisramos0	d282823d3a	Fix missing translation in user transaction history	2018-11-18 16:15:35 +00:00
Maikel	5ecea06098	Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl ... [Spree Upgrade] Fix credit card controller	2018-11-16 10:43:16 +11:00
Maikel	5d200b7753	Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for ... [Spree Upgrade] Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package	2018-11-16 10:41:29 +11:00
luisramos0	9ba0fc268e	Run transpec and clean up rubocop issues in credit_card_controller and spec	2018-11-15 11:07:43 +00:00
Maikel	d109f882fc	Merge pull request #3038 from luisramos0/2-0-order-factory ... [Spree Upgrade] Remove shipping_method_id from order factory	2018-11-15 15:22:31 +11:00
Maikel	2d3f706c05	Merge pull request #3042 from luisramos0/2-0-stable-nov-14th ... [Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)	2018-11-15 15:02:21 +11:00
luisramos0	688ec5fb21	Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec	2018-11-14 23:04:38 +00:00
luisramos0	7c0627a823	Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package	2018-11-14 23:04:38 +00:00
luisramos0	0a77eeb4b6	Merge branch 'master' into 2-0-stable-nov-14th	2018-11-14 11:35:58 +00:00
Hugo Daniel	3dd981ca05	Use logged in user (spree_current_user) for API authentication (current_api_user)	2018-11-14 11:58:28 +01:00
Pau Pérez Fabregat	e66f406ea6	Merge pull request #2946 from luisramos0/improve_taxons ... Sort Product categories alphabetically by name	2018-11-14 11:23:59 +01:00
luisramos0	2947d7a98c	Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout	2018-11-13 21:25:59 +00:00
luisramos0	a234308a06	Fix credit card controller by adding a rescue for wrong arguments passed in params	2018-11-13 15:28:10 +00:00
Maikel	d8d20429aa	Revert "Instagram pattern"	2018-11-09 13:33:11 +11:00
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
luisramos0	82befd945b	Sort Product categories alphabetically by name and fixsample data by fixing taxons taxonomy id	2018-10-30 18:00:48 +00: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