671 Commits

Author	SHA1	Message	Date
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	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
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
luisramos0	460e010408	Removed shipments from orders tab. This option is removed in spree 2	2018-12-05 11:38:16 +00:00
luisramos0	3776b891ce	Merge branch 'master' into 2-0-stable-dec-3rd	2018-12-03 15:30:16 +00:00
Hugo Daniel	24dab58de7	Lazy load translations and add keys	2018-11-30 10:49:36 +01:00
Hugo Daniel	aa948552e1	Import payment_methods edit view and apply overrides	2018-11-29 14:58:14 +01:00
Hugo Daniel	34bc79c7f6	Import payment_methods form partial and apply overrides	2018-11-29 14:58:06 +01:00
Hugo Daniel	29bc4c52a5	Import payment_methods#new view and apply overrides	2018-11-29 14:56:28 +01:00
Pau Pérez Fabregat	3ea7fac25f	Merge pull request #3095 from luisramos0/admin-users-transl ... In admin/users, convert Spree.t calls to t calls and use lazy lookup	2018-11-28 17:37:42 +01:00
Hugo Daniel	69e186f482	Define dynamic classes in variables as a turnaround to HAML bug	2018-11-28 10:31:47 +01:00
Hugo Daniel	65dd3eb5b9	Change line items controller HTML response spec to look for form order_edit class	2018-11-28 10:31:47 +01:00
Hugo Daniel	60214b9a90	Fix failing specs	2018-11-28 10:31:47 +01:00
Hugo Daniel	422a68630f	Remove data-hook tags	2018-11-28 10:31:47 +01:00
Hugo Daniel	652191a4c5	Fixing missing variable none	2018-11-28 10:31:47 +01:00
Hugo Daniel	c233ea38cf	Import Spree views for orders#edit in our codebase and integrate deface modifications	2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat	5c8a638320	Merge pull request #3055 from HugsDaniel/3051-products-edit-views ... [Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides	2018-11-27 17:32:25 +01:00
luisramos0	e153510a71	Merge branch 'master' into 2-0-stable-nov-24th	2018-11-24 15:19:38 +00:00
Pau Pérez Fabregat	6a1776b84a	Merge pull request #3053 from HugsDaniel/3050-products-new-views ... [Defacepocalypse] Import products#new view into our codebase and apply overrides	2018-11-21 14:43:22 +01:00
luisramos0	783e0eed3c	In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml	2018-11-21 11:46:14 +00:00
Pau Perez	23bda74ecb	Match name of filter and db column for consistency	2018-11-15 19:09:17 +01:00
Hugo Daniel	1309d80f65	Import products#edit and form partial in our codebase and apply overrides	2018-11-15 17:39:36 +01:00
Hugo Daniel	094d88d03a	Import products#new view into our codebase and apply overrides	2018-11-15 16:35:31 +01:00
Pau Perez	52e58a1c31	Remove unused @show_only_completed from view ... Now there's no difference in behavior. In both cases we sort by completed_at in the second column of the orders page.	2018-11-15 15:40:13 +01:00
Pau Perez	b7a3255dbe	Replace completed_at in orders table w/ created_at	2018-11-15 15:40:13 +01:00
luisramos0	0a77eeb4b6	Merge branch 'master' into 2-0-stable-nov-14th	2018-11-14 11:35:58 +00: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
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
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
Matt-Yorkley	d0b7b57017	Remove OrderSerializer#show_path and adjust to use #edit over #show	2018-11-06 11:07:14 +00: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
Matt-Yorkley	77251848ee	Refactor Spree::Admin::OrdersController	2018-10-26 21:38:57 +01: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	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	653c67971f	Remove order admin page filter 'show only unfulfilled orders' as done on spree 2	2018-10-20 15:11:47 +01:00
luisramos0	87cd73ddba	Merge branch 'master' into 2-0-stable-oct	2018-10-15 17:09:26 +01:00
Matt-Yorkley	fcff835922	Update results on dropdown select	2018-10-12 17:06:42 +01:00
Matt-Yorkley	dafcd0ddc2	Add per_page controls to admin orders index	2018-10-10 18:32:12 +01:00
Matt-Yorkley	37a7cceead	Fix bindings on angular orders data	2018-10-08 15:42:46 +01:00
Matt-Yorkley	55d7d5d1e4	Rename #capture_path to #payment_capture_path	2018-10-02 11:10:51 +01:00
Maikel	267edbdb45	Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new ... [Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides	2018-09-25 11:37:46 +10:00
Matt-Yorkley	6f2760cf92	Move translations into their namespace and use '.key' format	2018-09-24 15:54:05 +01:00
Hugo Daniel	06ee75981a	Add require_shipping_address to shipping_methods_form	2018-09-24 12:35:40 +02:00
Matt-Yorkley	9f57b43a13	Move sortble header elements to a partial	2018-09-23 22:14:12 +01:00
Pau Pérez Fabregat	3c4ec62352	Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit ... [Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides	2018-09-21 16:16:25 +02:00