5852 Commits

Author	SHA1	Message	Date
Kristina Lim	d573dc5023	Make order builder for enterprise fee summary flexible ... This is in preparation for tests for filtering the report.	2019-02-08 21:26:37 +00:00
Kristina Lim	4a00aceba2	Include shipping fees in enterprise fee summary	2019-02-08 21:26:37 +00:00
Kristina Lim	1273cc085b	Include payment fees in enterprise fee summary	2019-02-08 21:26:37 +00:00
Kristina Lim	7d74ddc85b	Add HTML view for enterprise fee summary report	2019-02-08 21:26:37 +00:00
Kristina Lim	418050c1b8	Remove blank strings from array report parameters ... Remove the blank strings that Rails multiple selects add by default to make sure that blank lists are still submitted to the server as arrays instead of nil. https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select	2019-02-08 21:26:37 +00:00
Kristina Lim	ec81e4221f	Add basic action for enterprise fee summary	2019-02-08 21:26:37 +00:00
Kristina Lim	5b6bbc3920	Add generation of CSV renderer filename	2019-02-08 21:26:37 +00:00
Kristina Lim	ed2b8e9b9f	Add CSV renderer for enterprise fee summary report	2019-02-08 21:26:37 +00:00
Kristina Lim	00e70733b0	Add test data for enterprise fee summary report	2019-02-08 21:26:37 +00:00
Kristina Lim	e7ed625d5a	Add processing of enterprise fee summary from DB	2019-02-08 21:26:37 +00:00
Kristina Lim	faf7079780	Specify sort order of enterprise fee totals data	2019-02-08 21:26:37 +00:00
Kristina Lim	a097640464	Add basic form object for enterprise fee summary	2019-02-08 21:26:36 +00:00
Kristina Lim	519a7d2ee6	Add datetime and integer array validator matchers	2019-02-08 21:26:36 +00:00
Kristina Lim	f6e8f18d89	Add validator for integer arrays ... Example usage: validates :related_post_ids, integer_array: true	2019-02-08 21:26:36 +00:00
Kristina Lim	de9cff6fc2	Add validator for datetime string ... Example usage: validates :start_at, date_time_string: true	2019-02-08 21:26:36 +00:00
Pau Perez	f998748634	Clarify why we end up with 3 adjustments ... And the second one is open.	2019-02-08 18:16:00 +01:00
luisramos0	3dc75c88d2	Delete empty controller class eval and spec. Useless left overs from 0ad2978926	2019-02-08 09:29:58 +00:00
luisramos0	1b4666fc6a	Add checkbox to cache settings to disable products cache	2019-02-07 20:06:27 +00:00
Pau Pérez Fabregat	88247064c4	Merge pull request #3397 from luisramos0/2-0-subs-allow-backorders ... [Spree Upgrade] Remove allow backorders from subscriptions specs	2019-02-07 20:32:49 +01:00
Pau Pérez Fabregat	676fa3d84d	Merge pull request #3433 from Matt-Yorkley/bi/user_permission ... Update cancan permissions for second iteration of bulk invoices	2019-02-07 20:17:34 +01:00
Pau Perez	cde465edad	Fix orders controller spec	2019-02-07 16:05:18 +01:00
Pau Pérez Fabregat	9613aa5a4d	Merge pull request #3400 from luisramos0/2-0-ship-methods ... [Spree Upgrade] Change app config to keep using ofn customized spree v1 shipping method calculators, not the new spree v2 ones	2019-02-07 15:41:06 +01:00
Pau Pérez Fabregat	fbde4a6c97	Merge pull request #3328 from luisramos0/2-0-pi-prod-reset ... [Spree Upgrade] Phase 2 - Product Import - Adapt product_reset_strategy	2019-02-07 15:35:44 +01:00
Pau Pérez Fabregat	259a5b211b	Merge pull request #3429 from luisramos0/2-0-in-stock ... [Spree Upgrade] 3428 Fix in_stock? and shopping/variant_overrides_spec	2019-02-07 15:25:43 +01:00
Pau Pérez Fabregat	56425139c0	Merge pull request #3439 from luisramos0/2-0-stable-Feb5 ... [Spree Upgrade] Merging master into 2-0-stable (1st run in Feb2019)	2019-02-07 15:09:23 +01:00
luisramos0	fe0fb22814	Improve readability in admin/orders_spec	2019-02-07 13:45:04 +00:00
Kristina Lim	428e58f8f7	Remove unused have_no_selector argument in feature test	2019-02-07 04:39:44 +08:00
Kristina Lim	fdede83086	Support selecting date in next months ... This was causing failures when selecting tomorrow when running tests on the last day of the month.	2019-02-07 04:39:43 +08:00
Kristina Lim	bb51f7e36b	Improve sync between keyword filter and selecting all	2019-02-07 04:36:28 +08:00
Kristina Lim	3eedee313e	Wait for datepicker to associate and open before selecting date	2019-02-07 04:36:24 +08:00
Pau Pérez Fabregat	8f63be9519	Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc ... Reduce restrictions for adding a variant to a subscription	2019-02-06 21:24:57 +01:00
Matt-Yorkley	2c3eeec2b9	Update cancan permissions for second iteration of bulk invoices	2019-02-06 18:19:53 +00:00
Luis Ramos	11304ef6fd	Merge pull request #3371 from luisramos0/2-0-xero-invoices ... [Spree Upgrade] Fix xero invoices report specs	2019-02-06 16:48:49 +00:00
Maikel Linke	3aea16e9ba	Cover alternative invoice template with specs	2019-02-06 15:06:44 +11:00
Maikel Linke	d97fa60c31	Remove code duplication and test PDF creation	2019-02-06 14:53:05 +11:00
Maikel Linke	7c5b430a37	Test execution of BulkInvoiceService#start_pdf_job ... The spec just tested if a job was enqueued, but not if the job can actually be executed. Unfortunately, this test is quite slow.	2019-02-06 11:26:22 +11:00
luisramos0	1b8445eb99	Merge branch 'master' into 2-0-stable-Feb5	2019-02-05 11:16:23 +00:00
luisramos0	698ba4618d	Adapt customer search override to spree v2 and fix customer details spec in admin orders spec	2019-02-04 18:58:02 +00:00
luisramos0	e5fdc89659	Fix distributor change spec in admin orders spec	2019-02-04 18:58:01 +00:00
luisramos0	c612df5174	Fix admin orders spec non tax adjustments by adapting to new view	2019-02-04 18:58:01 +00:00
Hugo Daniel	c823f942b4	Fix failing specs due to Spree 2's new order admin page ... Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work	2019-02-04 18:57:51 +00:00
Luis Ramos	5a4205d151	Merge pull request #3432 from kristinalim/fix/3327-intermittent_spec_failures ... 3327 [Flaky Spec] Fix shop accidentally becoming order coordinator	2019-02-03 19:32:40 +00:00
Luis Ramos	4b133bbc31	Merge pull request #3412 from kristinalim/fix/3059-race_condition_in_enterprise_image_specs ... 3059 [Flaky Spec] Fix race condition in enterprise image feature specs	2019-02-03 19:32:11 +00:00
Luis Ramos	a0b5509850	Merge pull request #3430 from kristinalim/fix/3420-intermittent_spec_failures ... 3420 [Flaky Spec] Fix date format in spec when single-digit day of month	2019-02-03 19:30:22 +00:00
Kristina Lim	3104862739	Fix shop accidentally becoming order coordinator ... The original setup of the order calls: create(:simple_order_cycle) Which picks an arbitrary distributor as coordinator: coordinator { Enterprise.is_distributor.first || ... } There is a chance that any of the existing distributor enterprises becomes coordinator, causing a test to intermittently fail. This commit makes the relationship between the reference enterprises and the order consistent.	2019-02-01 20:28:36 +00:00
Kristina Lim	4bff256f6d	Match date format in spec with import date filter ... This was failing if the current day of month only has one digit. The test could not find the date in the import date filter. Before this commit, the resulting string in the test replaced " " with " ", so "February 2" was being changed to "February 2". The import date filter however uses two spaces in this case, even if the browser shows only one (HTML inline text renders two spaces as just one).	2019-02-02 01:43:52 +08:00
Pau Pérez Fabregat	e1fb005e70	Merge pull request #3387 from kristinalim/fix/3384-product_import_timeout ... 3384 [Product Import] Process only one batch of rows at a time	2019-02-01 17:29:04 +01:00
luisramos0	e584fd2155	Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator. ... Added tests for it in scope_hub_to_variant and improved VO shopping specs	2019-02-01 16:18:09 +00:00
luisramos0	5d82efa213	Add unit test for VariantStock.can_supply?	2019-02-01 16:16:04 +00:00
luisramos0	80af7c770b	Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError	2019-02-01 08:32:45 +00:00