10354 Commits

Author	SHA1	Message	Date
Hugs	7ebf5db1f2	Added img tag when producer.description.length==0 to display logo even when no About Us	2018-03-14 11:44:04 +11:00
Maxime Lalisse	e806f38142	Fix translation keys	2018-03-14 10:13:40 +11:00
HugsDaniel	8c4d0f11d7	Changed status message with i18n t() filter to displau unsaved changes status for customers edition in admin dashboard	2018-03-13 21:03:54 +11:00
Pau Pérez Fabregat	976bbd8725	Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator ... Remove deprecated reference to Spree::MailMethod	2018-03-13 08:51:11 +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
Maikel Linke	8017921e89	Use I18nConfig in views	2018-03-09 17:45:04 +11:00
Enrico Stano	0aacb91f50	Merge pull request #2116 from coopdevs/clean-sample-data ... Clean sample data	2018-03-07 20:58:30 +01:00
Pau Perez	1b39d57800	Remove deprecated reference to Spree::MailMethod ... Said class is removed in https://github.com/spree/spree/pull/2643 in Spree.	2018-03-07 16:24:39 +01:00
Rob Harrington	09ca9ac2dd	Alter scope to return both completed and resumed orders	2018-03-07 14:24:59 +11:00
Rob Harrington	b98afc00ba	Show message about resumable orders when unpausing a subscription	2018-03-07 14:24:59 +11:00
Rob Harrington	7332e21013	Make InfoDialog more flexible (can show information as well as errors)	2018-03-07 14:24:58 +11:00
Rob Harrington	5cb0a1c371	Fix position of jQuery dialogs in admin section	2018-03-07 14:24:58 +11:00
Pau Perez	10d6a29503	Move service class to its own file	2018-03-06 15:30:25 +01:00
Pau Pérez Fabregat	392d0de6c5	Merge pull request #2055 from HugsDaniel/1766_entreprise_registration_scroll_on_first_step ... Changed bootstrap grid for medium size and above to have text and but…	2018-03-06 11:39:35 +01:00
Pau Pérez Fabregat	0fdd7dabd4	Merge pull request #2026 from Matt-Yorkley/uk/embedded_headers ... Only include one host in embedded shopfront headers	2018-03-06 11:07:32 +01:00
Hugo Daniel	f2eee77a15	fixed modal height and change grid to have button and text side by side	2018-03-06 16:21:35 +11:00
Rob Harrington	28491ee948	Skip stock check when requested quantity is zero ... This prevents an error being raised when available stock is negative	2018-03-02 14:53:24 +11:00
Rob Harrington	05e6c3daa6	Add message to indicate missing orders_close_at date	2018-03-02 13:28:34 +11:00
Rob H	9d8456cbf3	Merge pull request #2090 from oeoeaio/subs-styling ... Subs: Make checklist more legible	2018-03-02 13:24:05 +11:00
Rob Harrington	6f554814ce	Add class documentation for SubscriptionEstimator	2018-03-02 10:11:26 +11:00
Rob Harrington	f1545a4ab6	Show fee estimates in subscription totals in UI	2018-03-02 10:11:26 +11:00
Rob Harrington	31750a7bba	Add logic for calculator of fee estimates to SubscriptionEstimator	2018-03-02 10:11:26 +11:00
Rob Harrington	014283447d	Use delegate to access subscription shop	2018-03-02 10:11:26 +11:00
Rob Harrington	3b2d4ae2d4	Estimator take variant overrides into account	2018-03-02 10:11:26 +11:00
Rob Harrington	14a03aab35	Fallback to previous saved estimate if calculator not available	2018-03-02 10:11:26 +11:00
Rob Harrington	904a364bf1	Stop unnecessarily passing fee_calculators around	2018-03-02 10:11:26 +11:00
Rob Harrington	30df1d4345	Refector controller to allow price_estimate calculation	2018-03-02 10:11:26 +11:00
Rob Harrington	b85e38010f	Delegate responsibility to estimating prices for subscriptions to dedicated service object	2018-03-02 10:11:26 +11:00
Enrico Stano	14caac0212	Merge pull request #2074 from mjal/2057states-are-not-displayed-in-modify-address-pop-in-and-prevent-saving-2 ... Bug fix in customers edit address	2018-03-01 14:59:02 +01:00
Enrico Stano	6e9efe79b7	Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit ... Increase default enterprise limit	2018-03-01 14:40:24 +01:00
Maxime Lalisse	cff1d7224d	Bug fix in customers edit address	2018-03-01 22:02:39 +11:00
Matt-Yorkley	86a500bcdf	Fix browser caching of updated icon font	2018-02-23 20:49:42 +00:00
Matt-Yorkley	7bd0de99ac	Adjust brittle referer header check	2018-02-23 16:35:46 +00:00
Matt-Yorkley	e173f823c8	Refactor embedded logic	2018-02-23 15:57:28 +00:00
Matt-Yorkley	4a818c07bb	Only include one host in embedded shopfornt headers	2018-02-23 15:57:28 +00:00
Rob Harrington	1ac9417a20	Add class description for ProxyOrder	2018-02-22 16:23:10 +11:00
Rob Harrington	ae1c8344d1	Ensure price estimates generated for subscriptions take overrides into account	2018-02-22 16:16:49 +11:00
Rob Harrington	add9c83812	Ensure correct price is used by OrderFactory when building line items	2018-02-22 16:16:49 +11:00
Rob Harrington	993f02a989	Add knowledge of variant overrides to OrderFactory	2018-02-22 16:16:49 +11:00
Rob Harrington	d7d40a4a0f	Create new OrderFactory service object for initializing order from attr hash	2018-02-22 16:16:49 +11:00
Rob Harrington	6bf4ed1ac5	Add new review view to subscription wizard	2018-02-22 16:13:29 +11:00
Rob Harrington	6bdbdc06e7	Use select2_search instead of targetted_select2_search	2018-02-22 16:13:29 +11:00
Rob Harrington	2e94654f91	Create factory to hold auxillary functions for subscriptions ... NOTE: Moved estimatedSubtotal and estimatedTotal functions to the new factory from the subscription line items controller	2018-02-22 16:13:29 +11:00
Rob Harrington	2a731b2db5	Rename SubscriptionPrototype to SubscriptionActions	2018-02-22 16:13:29 +11:00
Rob Harrington	dcfa5fa42d	Use services to access injected data arrays	2018-02-22 16:13:29 +11:00
Rob Harrington	ad62b258ac	Populate 'all' array from Schedules#load	2018-02-22 16:13:29 +11:00
Rob Harrington	95f70409ee	Auto-load customers into service when present	2018-02-22 16:13:29 +11:00
Rob Harrington	3ac57269ed	Use .all convention for shipping and payment methods resource services	2018-02-22 16:13:29 +11:00
Rob Harrington	8951c79f71	Only count future orders in subs index order count	2018-02-22 15:09:33 +11:00
Rob Harrington	b3e7badd37	Fix incorrect translation key	2018-02-22 14:33:25 +11:00