10904 Commits

Author	SHA1	Message	Date
Andy Brett	f50577b489	refactor cloner to use ivars	2020-12-10 11:42:28 -08:00
Andy Brett	8c747e4812	refactor destroy_clones to separate class	2020-12-10 11:22:02 -08:00
Andy Brett	0ac248f03a	refactor offline payment methods	2020-12-10 10:26:38 -08:00
Andy Brett	50e87a023b	rename method to validate! since it can raise an error	2020-12-10 07:45:07 -08:00
Andy Brett	d55343da1a	only return gateway payment info if set on customer	2020-12-08 07:52:42 -08:00
Andy Brett	3a8203094a	refactor to remove boolean flag param	2020-12-08 07:52:42 -08:00
Andy Brett	f1d439870e	use a named argument for offline param	2020-12-08 07:52:42 -08:00
Andy Brett	9c544ef2f4	remove cloned cards after removing the platform card	2020-12-08 07:52:42 -08:00
Andy Brett	bc3fd8c50c	remove unused method	2020-12-08 07:52:42 -08:00
Andy Brett	277d7f44b7	refactor api customers controller; resolve merge conflict	2020-12-08 07:52:42 -08:00
Andy Brett	a466886a32	fix rubocop warnings	2020-12-08 07:52:42 -08:00
Andy Brett	fea7576ac1	update CreditCardCloner to find existing clone	2020-12-08 07:52:42 -08:00
Andy Brett	13ab25ac45	separate method for charging offline	2020-12-08 07:52:41 -08:00
Andy Brett	cad8a018f9	put SetupIntent on the connected Stripe account	2020-12-08 07:52:41 -08:00
Andy Brett	215d1bbe20	create js setup intent when authing shop	2020-12-08 07:52:41 -08:00
Andy Brett	b517d2f0c7	guard against a stripe customer already being deleted	2020-12-08 07:52:41 -08:00
Andy Brett	d0098e190f	close #4175	2020-12-08 07:46:10 -08:00
Andy Brett	f875e406a8	update karma specs for setting default card	2020-12-08 07:46:10 -08:00
Andy Brett	3b44c8e7e2	update UI after changing default card	2020-12-08 07:46:10 -08:00
Andy Brett	6fdcd6218d	add remove_shop_authorizations method to controller	2020-12-08 07:46:10 -08:00
Andy Brett	c60dcc75cd	confirm changes to default card	2020-12-08 07:46:10 -08:00
Andy Brett	747345ece9	only show authorized shops if there is a default card	2020-12-08 07:46:10 -08:00
Luis Ramos	0f27f57cbb	Use new Admin::ResourceController	2020-12-03 15:32:20 -08:00
Luis Ramos	1d327a61a6	Fix rubocop issue and adapt rubocop exceptions	2020-12-03 15:32:20 -08:00
Luis Ramos	0fb9f44dda	Make all controllers use new Admin::ResourceController	2020-12-03 15:32:20 -08:00
Luis Ramos	c63d99dd20	Remove Spree namespace from controller	2020-12-03 15:32:20 -08:00
Luis Ramos	99fd99cd33	Move spree admin resource controller to admin resource controller	2020-12-03 15:32:20 -08:00
Luis Ramos	1d075bbc90	Remove empty resource controller	2020-12-03 15:32:20 -08:00
Luis Ramos	6e08fccbbe	Merge resource_controller url helpers with parent version	2020-12-03 15:32:20 -08:00
Luis Ramos	fc4cf6a9a7	Merge resource_controller model_class method with parent version	2020-12-03 15:32:20 -08:00
Matt-Yorkley	0ceba7c0a8	Update orders closing message	2020-12-03 15:29:14 -08:00
Luis Ramos	f71de8123a	Dont show 'closing in' message when oc closes in more than 3 months	2020-12-03 15:29:14 -08:00
Luis Ramos	bfd4adbcee	Adapt code to work with frozen strings	2020-12-03 06:38:24 -08:00
Luis Ramos	611de912a8	Switch frozen_string_literal to false so that price code keeps working	2020-12-03 06:38:24 -08:00
Luis Ramos	de19efca64	Fix rubocop issue and add missing exceptions to manual_todo to get a green rubocop run	2020-12-03 06:38:24 -08:00
Andy Brett	902f8caea9	direct specifically to shop tab	2020-12-02 11:39:02 -08:00
Andy Brett	14091cd106	fix #6415	2020-12-02 11:39:02 -08:00
Andy Brett	8963a787d6	only validate unit_value presence if "items" is not chosen	2020-12-02 11:38:10 -08:00
Andy Brett	59cab902f0	add numericality validation	2020-12-02 11:38:10 -08:00
Andy Brett	4d2c93930b	resolve merge conflict	2020-12-02 11:38:10 -08:00
Andy Brett	65f6f1febf	rearrange css	2020-12-02 11:37:25 -08:00
Andy Brett	99b5d9e0c5	use white-space: nowrap on variant prices	2020-12-02 11:37:25 -08:00
Andy Brett	a3a6205343	fix #6252	2020-12-02 11:37:25 -08:00
Matt-Yorkley	7408c45980	Merge pull request #6297 from openfoodfoundation/rails-4-1 ... [Rails 4.1] Merge Rails 4.1 branch into master	2020-12-01 10:56:08 +01:00
Pau Pérez Fabregat	07a72eccd4	Merge pull request #6391 from Matt-Yorkley/paypal-stock-clashes ... Paypal stock clashes	2020-11-27 17:08:15 +01:00
Andy Brett	049f66c2aa	address #6411	2020-11-27 14:00:29 +00:00
Matt-Yorkley	c6c20dc0f6	Add ActionController::ConditionalGet to Api::BaseController ... This was added in Spree around the time of Rails 4.2 and seems to fix some of the response errors around the `responders` gem.	2020-11-27 14:00:29 +00:00
Matt-Yorkley	60aaf8100a	Fix some Rubocop offences	2020-11-27 14:00:29 +00:00
Matt-Yorkley	64153c5072	Remove #handle_asyncronously and update to recommended asyncronous devise mail method	2020-11-27 14:00:29 +00:00
Matt-Yorkley	9de3370a8a	Fix precision in adjustment form display ... The tests here were looking for values with a format like "10.00" but the output had changed to "10.0"	2020-11-27 14:00:29 +00:00