11468 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kristina Lim	a261d912ea	Simplify order sync logic for shipping methods	2019-03-13 12:45:54 +08:00
Kristina Lim	9316096d4d	Fix updating of the shipping method for an order	2019-03-13 12:45:54 +08:00
Kristina Lim	5b5d1967fd	Fix queries for pending order shipment in OrderSyncer	2019-03-13 12:45:53 +08:00
Kristina Lim	54991f8191	Retain shipping method when transitioning order	2019-03-13 12:45:53 +08:00
Kristina Lim	7a8bf76123	Move transitioning of order in admin/orders#edit to service	2019-03-13 12:45:50 +08:00
Kristina Lim	ce5691d080	Copy admin/orders#edit from Spree controller ... This method needs to be updated to use custom order advance logic in service.	2019-03-12 18:31:27 +08:00
Kristina Lim	f42eb3dab1	Create shipment when creating a order for a subscription ... A spec has been added to check that the attributes for the order states after "cart" ("address", "delivery", "payment") are retained if the order is transitioned to completion, BUT currently this is passing because it is the only shipping method available.	2019-03-12 18:31:27 +08:00
Kristina Lim	0306cc7ca7	Set shipping method when creating order for subscription	2019-03-12 18:31:26 +08:00
Kristina Lim	5f571aad2f	Set required ship address in order in spec ... The ship address of the order is properly set in ProxyOrder#initialise_order! through OrderFactory. The source of these spec failures seem to be a matter of how the records are set up for the tests.	2019-03-12 18:31:26 +08:00
Maikel	b94c6c1fb6	Merge pull request #3580 from luisramos0/2-0-stable-Mar6 ... [Spree Upgrade] Merging master into 2-0-stable (1st run in Mar2019)	2019-03-12 11:44:41 +11:00
Luis Ramos	f6ecf3de64	Merge pull request #3568 from luisramos0/2-0-improve-order-factories ... [Spree Upgrade] Improve order factories	2019-03-08 09:43:26 +00:00
luisramos0	61f1bf5ec8	Fix shipping_methods edit page missing translation	2019-03-07 17:15:06 +00:00
luisramos0	2470830ec8	Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui	2019-03-06 11:28:50 +00:00
luisramos0	b325cea6cb	Merge branch 'master' into 2-0-stable-Mar6	2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat	7e06807a11	Merge pull request #3539 from Matt-Yorkley/subs/confirmation_email ... Don't process proxy_order if the order has been cancelled	2019-03-05 17:38:29 +01:00
Pau Pérez Fabregat	3ddee83be5	Merge pull request #3404 from luisramos0/2-0-disable-cache ... [Spree Upgrade] Add checkbox to disable products cache	2019-03-05 14:51:11 +01:00
Pau Pérez Fabregat	30bbc5ee6f	Merge pull request #3472 from pacodelaluna/fix-datetime-picker ... Fix datetime picker on Order Cycle form	2019-03-05 14:50:34 +01:00
Pau Pérez Fabregat	b330db3b4b	Merge pull request #2947 from Matt-Yorkley/pi/submenu_link ... Pi/submenu link	2019-03-05 14:49:02 +01:00
Luis Ramos	72e9c1d002	Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices ... [Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again	2019-03-04 15:54:09 +00:00
Pau Pérez Fabregat	2369c54f9d	Merge pull request #3552 from luisramos0/2-0-fix-stock-migration ... [Spree Upgrade] Fix create default stock migration	2019-03-04 12:07:18 +01:00
luisramos0	d840fa7b77	Improve order factories: ... - Make order_with_totals_and_distribution shorter by inheriting from order_with_distributor - Make completed_order_with_fees more correct by inheriting only from order_with_distributor: this removes the line_item_with_shipment of order_with_totals_and_distribution that was causing an extra shipping adjustment to be kept in the order. This adjustment was being tested in the order controller spec (fixed the explanation comment in the spec which was wrong, there was no enterprise fee in this order)	2019-03-01 20:00:58 +00:00
Pau Pérez Fabregat	6c83f67b86	Merge pull request #3556 from Matt-Yorkley/pi/template ... Add description to CSV template	2019-03-01 11:37:58 +01:00
Maikel	a14c785e69	Merge pull request #3435 from Matt-Yorkley/bug/tmpfile ... Use Dir::Tmpname.make_tmpname for threadsafe file naming	2019-03-01 10:20:26 +11:00
Maikel	54679f6651	Merge pull request #3535 from luisramos0/translations-for-v2 ... Move to master all en.yml entries added so far to v2 and add more missing v2 translations	2019-03-01 10:04:13 +11:00
luisramos0	e4edfe0b61	Merge branch 'master' into translations-for-v2	2019-02-28 21:32:34 +00:00
Pau Pérez Fabregat	88e6fa84a2	Merge pull request #3534 from luisramos0/registration_trans_all ... Move registration process translations to lazy lookups to better organize the en.yml file	2019-02-28 17:15:09 +01:00
Pau Pérez Fabregat	aa635106ac	Merge pull request #3531 from mkllnk/document-stock-validation-rules ... Document stock validation of variant overrides	2019-02-28 17:14:45 +01:00
Pau Pérez Fabregat	89708de7c1	Merge pull request #3512 from kristinalim/fix/3478-scope_enterprise_fee_summary_to_eligible ... 3466,3478 [Enterprise Fee Summary] Scope report to eligible: true and non-zero adjustments	2019-02-28 17:14:15 +01:00
Pau Pérez Fabregat	6f0479c27d	Merge pull request #3547 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.16 ... Bump combine_pdf from 1.0.15 to 1.0.16	2019-02-28 17:13:50 +01:00
Pau Pérez Fabregat	63312a6d5f	Merge pull request #3554 from coopdevs/bring-bugsnag-initializer ... Bring in Bugsnag initializer from ofn-install	2019-02-28 16:41:59 +01:00
Maikel Linke	958e98debd	Document stock validation of variant overrides	2019-02-28 12:21:26 +11:00
Maikel	4ed0831e4c	Merge pull request #3550 from openfoodfoundation/transifex ... Transifex	2019-02-28 11:39:57 +11:00
Luis Ramos	f502ba0a1f	Merge pull request #3504 from luisramos0/2-0-scoping ... [Spree Upgrade] Add spec to order_cycle model covering variant scoping	2019-02-28 00:09:10 +00:00
Maikel	824beba066	Merge pull request #3505 from luisramos0/vo-false ... Adapt scope_variant_to_hub to new VO rules where on_demand=nil means use_producer_settings	2019-02-28 10:26:23 +11:00
Maikel	c472d2fbbe	Merge pull request #3498 from luisramos0/delete-dead-overrides ... Remove dead overrides	2019-02-28 10:25:42 +11:00
Maikel	65ba9324de	Merge pull request #3513 from luisramos0/2-0-remove-variant-count-on-hand ... [Spree Upgrade] Remove variant.count_on_hand (keep variant.on_hand only)	2019-02-28 09:07:41 +11:00
Pau Pérez Fabregat	a04de6e3cd	Merge pull request #3499 from openfoodfoundation/dependabot/bundler/stripe-4.9.0 ... Bump stripe from 4.5.0 to 4.9.0	2019-02-27 09:56:32 +01:00
Danni M	5b880f7bfe	Update issue templates ... Fixed headings on the story template	2019-02-27 10:41:39 +11:00
François Turbelin	82fbcd35a8	Update tests	2019-02-26 22:07:11 +01:00
Matt-Yorkley	9dd5b9dd6c	Fix import button specificity in feature spec	2019-02-26 20:06:02 +00:00
Matt-Yorkley	25e2d2adda	Update references to product_sub_menu view	2019-02-26 20:06:01 +00:00
Matt-Yorkley	777850259b	Apply and delete overrides	2019-02-26 19:42:47 +00:00
Matt-Yorkley	f1e55507c3	Recreate product_sub_menu Spree view	2019-02-26 19:42:47 +00:00
Matt-Yorkley	32470f33ec	Add description to CSV template	2019-02-26 19:36:44 +00:00
luisramos0	3f3581cdbc	Add more missing translations for v2, remove unnecessary en.order_state and remove duplicated en.spree.payment_states and en.spree.shipment_states	2019-02-26 16:54:48 +00:00
Pau Perez	4d47276810	Bring Bugsnag initializer from ofn-install ... This copies ofn-install's `roles/app/templates/bugsnag.rb.j2` to `config/initializers/bugsnag.rb`. All tasks and templates regarding Bugsnag can then be 🔥 from ofn-install. As a result, it'll fix the issue that both Katuma and OFF are facing where the `config/initializer/bugsnag.rb` symlink to `shared/config/bugsnag.rb` does not exist thus, nothing gets notified to Bugsnag since December 3rd (according to customer support).	2019-02-26 17:52:49 +01:00
luisramos0	4411e1ed43	Fix create default stock migration by adding a version of the code that works with the DB at that point in time, i.e., stock_locations without active column	2019-02-26 16:05:33 +00:00
luisramos0	7b05eebc5b	Fix rubocop issue in db migration	2019-02-26 14:54:24 +00:00
luisramos0	a0594f7616	Re-add invoice settings controller removed by mistake	2019-02-26 14:14:17 +00:00
luisramos0	a36722cebf	Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand	2019-02-26 12:47:11 +00:00