7873 Commits

Author	SHA1	Message	Date
luisramos0	c5a95dee79	Remove matching of product shipping category with shipping method's category to allow users to checkout products with categories not supported by the shipping methods. ... See issue #3884 for more details.	2019-05-29 14:43:19 +01:00
luisramos0	07854cf372	Fix a few problems introduced by rubocop auto correct	2019-05-28 12:57:29 +01:00
luisramos0	86b0d71c7e	Result of rubocop auto-correct and rebuilding rubocop_manual_todo	2019-05-28 12:57:29 +01:00
luisramos0	4a67acf954	Removing a few rubocop warnings	2019-05-28 12:55:17 +01:00
Luis Ramos	9ccf502365	Merge pull request #3797 from lin-d-hop/variant-master-price ... Remove non-functional Price field from Edit Product screen	2019-05-28 10:30:05 +01:00
Luis Ramos	db0c874622	Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views ... [Spree Upgrade] Remove dependency to spree frontend - views and assets	2019-05-24 14:37:34 +01:00
Luis Ramos	4a321f200f	Merge pull request #3783 from kristinalim/fix/3782-missing_translation ... 3782 Fix missing translation in subscription update modal	2019-05-23 18:45:20 +01:00
Luis Ramos	12282ad906	Merge pull request #3794 from m-budryte/replace_&_with_OR ... & replaced by OR when multiple property filters are selected	2019-05-23 14:35:51 +01:00
luisramos0	115b5dadef	Remove more dead code from usersregistration (signup calls are always ajax)	2019-05-21 12:39:29 +02:00
luisramos0	d9438cb082	Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets	2019-05-21 12:39:29 +02:00
luisramos0	ffd883e84d	Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it	2019-05-21 12:39:29 +02:00
luisramos0	25fd6f2e78	Move empty check template from spree_frontend, it is required from the checkout page ... This makes ofn code completely independent from spree_frontend views	2019-05-21 12:39:29 +02:00
luisramos0	a0c56f31c7	Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code	2019-05-21 12:39:29 +02:00
Pau Pérez Fabregat	f113ac61d7	Merge pull request #3839 from coopdevs/report-cache-diff-in-new-tab ... Report cache diff in new tab	2019-05-10 14:38:33 +02:00
Pau Perez	9a98a7c974	Report cache diff to Bugsnag in a new tab ... This will allow us to see the difference between the cache entry and the actual shopfront. Otherwise, there is no way to see what wasn't refreshed in the cache.	2019-05-10 13:13:20 +02:00
Luis Ramos	f844ff275b	Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757 ... added buttons to form and updated sanitizer to allow extra formatting	2019-05-10 10:48:55 +01:00
Maikel	50ca1f7173	Merge pull request #3824 from mkllnk/aus-content-updates ... Aus content updates	2019-05-10 10:40:09 +10:00
Luis Ramos	59e7cb313d	Merge pull request #3815 from amers185/add_social_links ... Add extra (Instagram) social media links to emails sent to customers and users [Looking for feedback/direction on completing solution]	2019-05-09 21:14:42 +01:00
Luis Ramos	6d62f4c4b4	Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information ... 1218 Remove OC "Debug Information" which appears in non-production environments	2019-05-09 16:05:18 +01:00
Luis Ramos	19881927e3	Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub ... Add review & edit sub keys	2019-05-09 16:04:38 +01:00
Luis Ramos	24c96fab8b	Merge pull request #3795 from lin-d-hop/translation-oc-spinner ... Add translation to order cycle spinner	2019-05-09 16:03:53 +01:00
Maikel Linke	a97792cbc3	Remove story from code comment	2019-05-09 11:57:13 +10:00
Masha	5eacf05a45	used string interpolation for clarity	2019-05-08 15:05:15 +01:00
Masha	d5ff733f0b	spaces location swapped	2019-05-08 15:05:13 +01:00
Masha	5470f8d758	new translation key for products_or created	2019-05-08 15:03:28 +01:00
Masha	94cbac00a5	& replaced by OR when multiple property filters are selected	2019-05-08 15:00:59 +01:00
luisramos0	77178ca595	Add href and target attributes to product serializer sanitizer to allow links with target in product descriptions	2019-05-08 14:46:57 +01:00
idanceinbetween	7790401d59	added buttons to form and updated sanitizer to allow extra formatting	2019-05-08 14:45:05 +01:00
Maikel Linke	a3adbd9fc8	Replace connect-learn banner with custom content ... The connect and learn banner is only used in Australia at the moment. We would like to have customisable content here. Now every instance can choose to place a custom alert banner at the top. Unfortunately, custom banners are not translated into other languages. That's why I kept the standard register call. For example, the register call is in use where it is displayed in French and Italian. Completely switching to custom content would break the translation. Translations in custom content are an existing feature request, "multi-lang 2.0".	2019-05-08 11:38:49 +10:00
Luis Ramos	4c767cd5b4	Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations ... 3760 Optimizations related to OCs	2019-05-07 21:12:44 +01:00
Luis Ramos	6658f85f59	Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation ... 3292 link popup text translation	2019-05-07 21:11:31 +01:00
Luis Ramos	dffa50468b	Merge pull request #3801 from Matt-Yorkley/need_for_speed ... Fix /maps performance	2019-05-07 21:08:34 +01:00
Kristina Lim	12b28fdc32	Remove "Debug Information" in edit OC page	2019-05-08 01:33:58 +08:00
Pau Pérez Fabregat	fc38906e60	Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category ... [Spree Upgrade] shipping_category now required for products	2019-05-07 16:12:05 +02:00
Kristina Lim	c3d4288692	Fix translation for closed/closes in subscription update modal	2019-05-07 14:52:03 +08:00
Syed Usama Amer	f71df770d0	added social links	2019-05-06 23:28:14 -05:00
Matt-Yorkley	6a8a67560b	Fix API authentication	2019-05-07 00:36:08 +01:00
Matt-Yorkley	6bdc5d4438	Fix maps performance	2019-05-07 00:36:08 +01:00
Kristina Lim	56bc497fe2	Simplify code for enterprise serializer for OCs	2019-05-06 23:49:55 +08:00
lin-d-hop	7b87e609c4	Set master variant price in products controller ... Set master variant price in products controller Code climate tidy up Syntax improvement Revert "Remove non-functional Price field from Edit Product screen" This reverts commit 585072302c. Syntax improvement fixing revert Revert "Remove non-functional Price field from Edit Product screen" This reverts commit 585072302c. fixing conflicts	2019-05-06 14:20:01 +01:00
Kristina Lim	7593168341	Update code style for Enterpise.not_ready_for_checkout ... This was changed into multiple lines for readability.	2019-05-06 18:37:28 +08:00
Kristina Lim	c0a5bcce92	Update some comments in Enterprise and OrderCycle models	2019-05-06 18:35:01 +08:00
Kristina Lim	4430c88a95	Eager-load some data for admin order cycle pages	2019-05-06 15:41:29 +08:00
Kristina Lim	f14e7e97b1	Do not check need to warn of invalid OCs unless request is HTML	2019-05-06 15:41:29 +08:00
Kristina Lim	781afc1015	Change OC :suppliers and :distributors to associations	2019-05-06 13:43:44 +10:00
Kristina Lim	71bff0dd5b	Reduce the number of queries in Enterprise.not_ready_for_checkout	2019-05-06 13:43:44 +10:00
lin-d-hop	10fba9b39f	Add translation to order cycle spinner ... lazy text	2019-05-05 19:12:53 +01:00
lin-d-hop	585072302c	Remove non-functional Price field from Edit Product screen ... Update initializer to override Product Price as required field. Revert "Update initializer to override Product Price as required field." This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.	2019-05-05 16:41:54 +01:00
Matt-Yorkley	3323ac7650	Fix duplicate error messages	2019-05-05 13:30:38 +01:00
Pau Pérez Fabregat	b443f5ece9	Merge pull request #3789 from hughbric/remove_payment_enterprise_id_refs ... references to payment_enterprise_id removed, new migration created	2019-05-05 12:30:19 +01:00