8189 Commits

Author	SHA1	Message	Date
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
Matt-Yorkley	dee9521f77	shipping_category now required for products	2019-05-05 12:00:46 +01:00
Luis Ramos	17f126d80c	Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page ... Add display_name and display_as to admin edit variant page	2019-05-05 11:31:27 +01:00
jazzdragon	37d15a1be3	Add classes to indicate collapsible is for medium screens or smaller	2019-05-04 20:12:12 -07:00
jazzdragon	623471290e	Make sure styling doesn't get messed up if resizing down and back up	2019-05-04 19:52:08 -07:00
jazzdragon	a876f81f0a	Make collapsible always visible on large screen	2019-05-04 19:48:30 -07:00
jazzdragon	271330d2fc	Add collapsible elements and styles	2019-05-04 19:43:46 -07:00
stveep	7090281da5	Reorganise defaces so that display name fields come first	2019-05-04 21:48:32 +01:00
Pau Pérez Fabregat	958b144948	Merge pull request #3787 from eelcodevlieger/issue_3777-Make_all_map_icons_green ... issue 3777 - Make all map icons green	2019-05-04 19:54:02 +02:00
stveep	a959702905	Add display_name and display_as to admin edit variant page	2019-05-04 17:20:12 +01:00
Michael Hughes	9e56198092	references to payment_enterprise_id removed, new migration created	2019-05-04 16:32:48 +01:00
Eelco de Vlieger	4b2114c1e4	issue 3777 - Make all map icons green	2019-05-04 14:44:16 +01:00
kkoomin	f65ce82778	changed string into translation key & add 'infinity' key	2019-05-04 14:40:45 +01:00
Luis Ramos	6f0d155508	Merge pull request #3742 from openfoodfoundation/2-0-stable ... Merge 2-0-stable to master	2019-05-04 00:06:27 +01:00
Luis Ramos	4afa0cdca1	Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed ... 2788 [Subscriptions] Fix address issues when syncing subscriptions and orders	2019-05-03 23:48:32 +01:00
Luis Ramos	637e99367d	Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug ... [Spree Upgrade] Fix bug in Variant Overrides controller	2019-05-02 17:31:13 +01:00
luisramos0	4a9570b1a1	Merge branch '2-0-stable' into fix/2788-ship_address_changed	2019-05-02 16:17:53 +01:00
Luis Ramos	3b2e614c57	Merge pull request #3734 from luisramos0/2-0-validate-distribution ... Removing a variant from OC will prevent user with that variant in the cart from checking out	2019-05-02 16:12:41 +01:00
Luis Ramos	edaf2479dc	Merge pull request #3741 from luisramos0/2-0-stable-Apr15 ... [Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)	2019-05-02 11:26:54 +01:00
luisramos0	340cbe5947	Eager load variants with variant overrides to avoid n+1 in the following line	2019-05-02 11:10:53 +01:00
Syed Usama Amer	75a7745736	Closes translation bug for enterprise fee settings	2019-05-01 10:43:35 -05:00
Kristina Lim	19726061e4	Make Order#address_from_distributor public	2019-05-01 07:17:50 +08:00
Kristina Lim	92dc43d7a2	Make OrderUpdater#shipping_address_from_distributor public	2019-05-01 07:16:56 +08:00
Kristina Lim	0933d53134	Extract method OrderSyncer#update_ship_address_for	2019-05-01 07:16:56 +08:00
Kristina Lim	14d407879c	Rename method OrderSyncer#update_ship_address_for ... This method has become only a small part of the logic for updating the order's ship address. This no longer follows the method naming convention within OrderSyncer where update_*_for describes almost the complete logic for updating the association. This is renamed in preparation for extraction of the complete update logic for ship_address. The new method will be named update_ship_address_for.	2019-05-01 07:16:56 +08:00
Kristina Lim	6952f4ecd1	Improve readability of conditions in OrderSyncer	2019-05-01 07:16:55 +08:00
Kristina Lim	78aa9da2cf	Uncomment and update OrderSyncer failing specs ... This still achieves a logic issue before the Spree upgrade, where switching from pick-up to delivery affects whether simultaneous changes to shipping address are ignored or not. This behaviour can be fixed in a separate PR.	2019-05-01 07:16:54 +08:00
Kristina Lim	bdf4132e01	Fix order shipment references in OrderUpdater	2019-05-01 07:16:54 +08:00
luisramos0	d7e706e6e7	Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code	2019-04-29 13:40:52 +01:00
jazzdragon	7a27973ae3	Add translation and references in taTranslations (not working in alert)	2019-04-27 19:22:15 -07:00
jazzdragon	f6c0071554	Add reference comment	2019-04-27 17:01:07 -07:00
jazzdragon	35de9077da	Add config for taTranslations (no functional change)	2019-04-27 16:57:02 -07:00
Maikel	99a4878bdf	Merge pull request #3653 from mkllnk/2520-spree2-order-subscription ... 2520 Remove `process_payments!` override	2019-04-19 07:34:30 +10:00
Maikel	736ac49581	Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues ... [Spree Upgrade] Fix two issues in admin orders edit page	2019-04-19 07:33:26 +10:00
luisramos0	a68b5eaf22	Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants	2019-04-17 15:31:19 +01:00
luisramos0	3d420d5727	Merge branch 'master' into 2-0-stable-Apr15	2019-04-16 21:14:11 +01:00
Luis Ramos	eeac75ade1	Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug ... [Spree Upgrade] Fix split button reappearing when editing line item quantity	2019-04-16 15:28:43 +01:00
Luis Ramos	67a7e26757	Merge pull request #3695 from luisramos0/2-0-emails-transl ... [Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn	2019-04-16 13:44:24 +01:00
Maikel Linke	8b9a814131	Remove obsolete Spree 2 backport on Order	2019-04-16 10:30:14 +10:00