11818 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Pau Pérez Fabregat	380a9c561e	Merge pull request #3725 from coopdevs/add-specs-for-cache-variant-deletion ... Add specs for the cache refresh on variant removal	2019-04-19 19:02:04 +02: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
Luis Ramos	6b84edb6d9	Merge pull request #3736 from kristinalim/feature/enable_newrelic_test_mode ... Install and set up newrelic_rpm gem for development environment	2019-04-16 15:35:36 +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
Luis Ramos	29000ebe0d	Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report ... [Spree Upgrade] Fix Enterprise fee report specs	2019-04-16 12:36:53 +01:00
Maikel Linke	278190a25c	Update specs for Spree v2 payment requirement ... This pull request removed the override of `process_payments!` which was based on v1. Spree v2 has an additional check: An order in payment state requires a payment. Some specs didn't care and didn't create payments before transitioning to `complete`.	2019-04-16 10:30:14 +10:00
Maikel Linke	8b9a814131	Remove obsolete Spree 2 backport on Order	2019-04-16 10:30:14 +10:00
Maikel Linke	6f12eee8ae	Reduce the override of Order for subscriptions ... Orders belonging to subscriptions get completed without payment. That requires overriding Spree's functionality. In Spree 2, an order in payment state without pending orders is invalid. Instead we skip the payment state by not requiring a payment for automatically generated orders until the order cycle is closed.	2019-04-16 10:30:14 +10:00
Pau Pérez Fabregat	6d0ecdc4a6	Merge pull request #3721 from Matt-Yorkley/subs_styles ... Subs styles	2019-04-15 12:53:27 +02:00
Luis Ramos	1e85bf6a68	Merge pull request #3641 from luisramos0/2-0-update-spree-2-0-4-revision ... [Spree Upgrade] Update spree revision to include last package_factory fix	2019-04-12 22:16:15 +01:00
Kristina Lim	53bd421389	Add newrelic.yml to .gitignore	2019-04-12 13:57:50 +08:00
Kristina Lim	6f5a024be2	Update script/setup to create default newrelic.yml	2019-04-12 13:57:50 +08:00
Kristina Lim	d983e400cd	Add config/newrelic.yml.example for newrelic_rpm gem	2019-04-12 13:57:50 +08:00
Kristina Lim	c5e4b283f1	Install latest newrelic_rpm gem with test mode	2019-04-12 13:57:47 +08:00
Luis Ramos	0f00f48f13	Merge pull request #3634 from luisramos0/2-0-fix-sample-data ... [Spree Upgrade] Fix new sample data in v2	2019-04-11 23:07:15 +01:00
luisramos0	46278e3edd	Set distributor in order and shipping methods so that refreshing shipment rates suceeds	2019-04-10 22:16:09 +01:00
luisramos0	5791eba9bd	Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed	2019-04-10 22:16:09 +01:00
luisramos0	c852c616d5	Update spree revision to include last package_factory fix and update spree dependencies	2019-04-10 22:16:09 +01:00
Luis Ramos	ddd3443a86	Merge pull request #3659 from mkllnk/missing-translation ... Fix "What's this?" on admin dashboard	2019-04-10 22:05:19 +01:00
Luis Ramos	4bf9320be8	Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees ... Close adjustments so that updates are effective	2019-04-10 21:58:22 +01:00
Luis Ramos	83a4771cdd	Merge pull request #3720 from Matt-Yorkley/spree2/translations ... Subs: missing translations	2019-04-10 21:47:47 +01:00
Luis Ramos	984155013c	Merge pull request #3648 from luisramos0/2-0-fix-ui-issue ... [Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list	2019-04-10 21:46:40 +01:00
Luis Ramos	97c920f1b0	Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments ... 3477 Render only eligible adjustments on the order page	2019-04-10 21:44:16 +01:00
Pau Perez	f20a15e955	Add specs for the cache refresh on variant removal ... This is failing in `master` but thanks to the VariantDeleter it does work in v2. This specs prove it.	2019-04-10 16:16:00 +02:00
Matt-Yorkley	14fd821283	Rename states SCSS file for clarity	2019-04-10 13:12:44 +01:00
Matt-Yorkley	e486a94fb4	Add missing translations in subscriptions	2019-04-10 12:16:31 +01:00
Matt-Yorkley	9e0f35d635	Re-adjust buttons. Much better!	2019-04-10 12:15:21 +01:00
Matt-Yorkley	e13db873b0	Fix subs panel button vertical alignment	2019-04-10 12:15:21 +01:00
Matt-Yorkley	896a45c399	Fix subs state buttons	2019-04-10 12:15:21 +01:00
Matt-Yorkley	3968cfd238	Fix chevron horizontal position	2019-04-10 12:15:21 +01:00
Matt-Yorkley	3578d82cbf	Merge pull request #3718 from luisramos0/2-0-fix-build ... [Spree Upgrade] Add order distributor to shipping method in reports_spec	2019-04-10 12:14:00 +01:00
luisramos0	e4c54a4954	Add order distributor to shipping method in reports_spec	2019-04-09 23:26:14 +01:00
Luis Ramos	4478d51aee	Merge pull request #3668 from luisramos0/2-0-stable-Mar29 ... [Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)	2019-04-09 17:46:36 +01:00
Luis Ramos	449e58723d	Merge pull request #3591 from luisramos0/2-0-fix-migrations ... [Spree Upgrade] Fix Migrations to 2.0	2019-04-09 13:16:34 +01:00
Luis Ramos	ef2e00ae31	Merge pull request #3604 from luisramos0/2-0-fix-splitters ... [Spree Upgrade] Override default spree splitters config	2019-04-09 09:19:00 +01:00
luisramos0	e9491cecab	Fix flaky spec by having only one variant with display name small bag	2019-04-06 10:14:19 +01:00
luisramos0	258a9efa0d	Adapt product_importer_spec to ofn v2 where there’s no product.count_on_hand and on_hand does not default to infinity if product.on_demand	2019-04-05 22:09:46 +01:00
luisramos0	bb4cec1186	Fix order_and_distributor_report_spec by setting ofn shipping method the ofn v2 way	2019-04-05 22:06:44 +01:00
luisramos0	ecc60f3b61	Merge branch 'master' into 2-0-stable-Mar29	2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat	0c75a070c6	Merge pull request #3650 from kristinalim/fix/2786-address_subscription_confirm_job_failing_specs ... 3487,2786 [Spree Upgrade] Address spec failures for SubscriptionConfirmJob	2019-04-05 15:45:41 +02:00
Pau Perez	3e7e24d700	Make VariantController specs aware of destroy call ... In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so stubbed calls needed fixing.	2019-04-05 15:38:10 +02:00
Pau Pérez Fabregat	10165c4246	Merge pull request #3680 from kristinalim/fix/3285-db_migration_bang_shipping_rates ... [Spree Upgrade] Bang version of create in DB migration for shipping rates	2019-04-05 15:11:41 +02:00
luisramos0	5989a654d1	Remove stock location from stock levels table and fix Spree.t entry bug	2019-04-05 14:01:27 +01:00
Pau Pérez Fabregat	1b55d04963	Merge pull request #3673 from Matt-Yorkley/spree2/css ... Spree2/css	2019-04-05 14:57:57 +02:00
Pau Pérez Fabregat	67376a29a6	Merge pull request #3694 from Matt-Yorkley/db2fog ... Fix outdated db2fog initializer	2019-04-05 12:26:07 +02:00
luisramos0	87327f7aa9	Fix specs testing order cancelation email. The email template now needs a order distributor for the signoff part	2019-04-04 13:41:07 +01:00