77 Commits

Author	SHA1	Message	Date
luisramos0	c1d14686a6	Merge branch 'master' into 2-0-stable-Mar22	2019-03-22 10:55:17 +00:00
luisramos0	3117dbf624	Remove product distributions from order model	2019-03-13 11:50:35 +00:00
luisramos0	15456577a3	Remove the button that enables user to split an order between stock locations ... There's only one stock location in OFN so this feature is not useful at this point	2019-02-25 23:39:21 +00:00
luisramos0	b73ca88811	Fix edit ship method and tracking number in backoffice order page ... The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons	2019-02-20 23:57:57 +00:00
luisramos0	fe0fb22814	Improve readability in admin/orders_spec	2019-02-07 13:45:04 +00:00
luisramos0	698ba4618d	Adapt customer search override to spree v2 and fix customer details spec in admin orders spec	2019-02-04 18:58:02 +00:00
luisramos0	e5fdc89659	Fix distributor change spec in admin orders spec	2019-02-04 18:58:01 +00:00
luisramos0	c612df5174	Fix admin orders spec non tax adjustments by adapting to new view	2019-02-04 18:58:01 +00:00
Hugo Daniel	c823f942b4	Fix failing specs due to Spree 2's new order admin page ... Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work	2019-02-04 18:57:51 +00:00
luisramos0	0460e7fc6c	Merge branch 'master' into 2-0-stable-jan-17th	2019-01-17 22:51:25 +00:00
Rob Harrington	3a781049ed	Update orders_spec to work with Selenium	2019-01-16 16:21:30 +00:00
Rob Harrington	56c07aac5c	Don't run ticket printing spec	2019-01-16 16:21:30 +00:00
luisramos0	bdefc0ebd1	Fix admin orders spec by adapting the spec to the recently de-defaced page	2019-01-07 12:16:28 +00:00
Matt-Yorkley	fd47756e2f	Remove workaround in failing feature spec ... Removed an old workaround that clicked a button multiple times. This was no longer working and causing the spec to fail.	2018-11-05 11:19:57 +00:00
luisramos0	a5d4c50dea	Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test.	2018-10-26 21:32:16 +01:00
luisramos0	87cd73ddba	Merge branch 'master' into 2-0-stable-oct	2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat	58a99a7f89	Merge pull request #2692 from Matt-Yorkley/bi/angular_orders ... Angularise orders page	2018-10-04 21:10:48 +02:00
luisramos0	33d2b65d65	Removed deprecated spec helper have_select2_option and fixed its last usage	2018-09-20 23:01:23 +01:00
Matt-Yorkley	b2551b4e0b	Rewrite existing specs	2018-09-19 13:00:30 +01:00
luisramos0	93ac99b5cc	Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec	2018-09-17 00:44:14 +01:00
Maikel Linke	9023b16395	Speed up admin orders spec ... From 80s to 74s.	2018-08-07 16:01:37 +10:00
Pierre de Lacroix	e0b12b1332	Remove dependency on model method in feature test	2018-03-20 12:18:54 +01:00
Pierre de Lacroix	03de6c690c	Fix incorrect tax amount on Admin Order #show ... by calling Order#tax_adjustment_totals from Order#price_adjustment_totals	2018-03-20 12:18:09 +01:00
Keir Osborn	d4b84e55c2	order order cycle list from most lates close date to earliest on /orders page #1884	2018-03-12 11:04:50 +00:00
Pierre de Lacroix	12e3b88b71	Fix some old Rspec syntax	2018-03-06 01:24:54 +01:00
Matt-Yorkley	c34570154c	Use contact model in printed tickets	2018-02-07 10:41:53 +11:00
Pierre de Lacroix	42433d1ad4	Add feature test for the Spree::Admin::OrdersController print_ticket action	2017-12-20 23:01:18 +01:00
Maikel Linke	162b392004	Use expect syntax, correct spec description	2017-11-10 08:47:12 +11:00
Maikel Linke	26bedf0523	Make title matcher more robust	2017-11-10 08:47:12 +11:00
Maikel Linke	ff3ee62509	Remove old comment	2017-11-10 08:47:12 +11:00
Maikel Linke	9c2a78adf2	Avoid warnings, use expect syntax	2017-11-10 08:47:12 +11:00
Rob Harrington	dd56e03be1	Stop setting host for url helpers in specs	2017-09-23 14:58:34 +10:00
Maikel Linke	b8c2e54194	Fix i18n key and spec	2017-07-21 12:17:14 +10:00
François Turbelin	a0595bc45a	Add missing translations on views	2017-07-19 09:45:11 +10:00
stveep	38c25c412f	Remove duplicated spec, better error message suppression, fix shipping test to wait correctly	2017-05-19 16:14:22 +10:00
stveep	4699c654fc	Fix feature specs for new 'new admin order' flow	2017-05-19 16:10:06 +10:00
Bing Xie	b0402daf32	Fix failed customers filter spec	2016-10-21 10:51:36 +11:00
Bing Xie	a94a30f422	Update the orders spec	2016-10-21 10:51:36 +11:00
Rob Harrington	7e932f091d	Use have_current_path rather than current_path.should ==	2016-05-25 08:10:20 +10:00
Rob Harrington	af5eec7094	WIP (Angular 1.4 Upgrade): Adding filters to ofn-select2 and using on order create/edit UI	2016-05-25 08:10:20 +10:00
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Rohan Mitchell	3f8d470d23	When admin associates user with an order, look up last used address	2015-12-11 13:06:59 +11:00
Rohan Mitchell	ae3061df80	All orders specs use JS	2015-12-11 13:06:59 +11:00
Rohan Mitchell	e33ede0ec2	Include order cycle status in new order form	2015-12-11 13:06:58 +11:00
Rohan Mitchell	76d4fbccf9	Use select2 for order cycle selection	2015-12-11 13:06:58 +11:00
Rohan Mitchell	222b390b31	Fix error display	2015-12-11 13:06:57 +11:00
Rohan Mitchell	3419198635	Disable distributors that do not have an order cycle	2015-12-11 13:06:57 +11:00
Rohan Mitchell	1026b81d0c	Do not show order cycle choice until distributor is chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	c74463404d	Only show order cycle options that include the chosen distributor	2015-12-11 13:06:57 +11:00