Pau Perez
e876ef7df1
Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop
2018-04-09 17:22:52 +02:00
Rob Harrington
236ba9328d
Order cycles in specs comply with new date validations
2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956
Return an error if no order_cycle_set params are submitted to #bulk_update action
2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d
Refactor loading of OrderCycleSet in OrderCyclesController
...
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
2018-04-04 17:17:36 +10:00
stveep
46d2d6cb8a
Include option text in dropdown cart even if the variant and product have the same name
2018-04-04 16:40:18 +10:00
Hugo Daniel
2a942da160
Use rspec context
2018-04-04 14:58:48 +10:00
Hugo Daniel
bd97d08653
Remove stub after test and create two distinct calculators
2018-04-04 14:58:47 +10:00
Hugo Daniel
68ca352510
Use rspec expect syntax
2018-04-04 14:58:47 +10:00
Hugo Daniel
a71b650f89
Added tests
2018-04-04 14:58:47 +10:00
Hugo Daniel
5ec89dde42
Update test sentences to fit new PriceSack behavior
2018-04-04 11:25:26 +10:00
Hugo Daniel
213456f4d9
Moved PriceSack tests from per item list to per order
2018-04-04 11:25:26 +10:00
Hugo Daniel
28009afbea
Calculate price sack fees and tests
2018-04-04 11:25:25 +10:00
Matt-Yorkley
357ff5fb7d
Improve associating customer specs
2018-04-04 10:14:55 +10:00
Matt-Yorkley
5f2e72e3d4
Private shop spec
2018-04-04 10:14:55 +10:00
Em-AK
3b5c3f41a2
Ensure created users are associated with customers
...
When a user is created with the same email as existing customers
Then the user is associated with these customers
So that the user can access the private shops where he has been invited
to before signup
2018-04-04 10:14:55 +10:00
Rob Harrington
a83bdf16c9
Add error message for case when schedule cannot be deleted
2018-04-04 09:21:52 +10:00
Pau Pérez Fabregat
15bd0de971
Merge pull request #2194 from wrycoder/spec-deprecation-fix
...
Replacing deprecated #ignore with #transient
2018-04-03 18:53:04 +02:00
Pau Pérez Fabregat
87329ad729
Merge pull request #2092 from ltrls/fix-tax-admin-order-show
...
Fix incorrect tax on Admin Order Show
2018-04-03 08:36:10 +02:00
Michael Toulouse
0519269a53
Replacing deprecated #ignore with #transient
2018-04-02 06:40:12 -04:00
Pau Perez
0cbd967007
Remove in_stock dead scope
...
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
2018-03-28 12:13:34 +02:00
duende13
f75b865be8
Made changes requested by reviewer, in labels and tests.
2018-03-27 15:21:11 +11:00
duende13
7670d01c6d
Changing SEO tab to 'Search' tab
2018-03-27 15:21:11 +11:00
duende13
61300a62c2
Added 'meta_keywords' to search of products in shop page. Changed labels
...
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
2018-03-27 15:21:11 +11:00
Pau Pérez Fabregat
17b129ff4f
Merge pull request #2079 from mjal/424cart-page-shouldnt-show-admin-handling-if-it-is-zero
...
Cart page shouldnt show admin handling if it is zero
2018-03-23 18:01:09 +01:00
Pau Pérez Fabregat
dadc02fb11
Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails
...
Uk/1663variant order emails
2018-03-23 15:29:05 +01:00
Pau Pérez Fabregat
82457d2b63
Merge pull request #2138 from Matt-Yorkley/email/manager_invite
...
Email/manager invite
2018-03-23 15:27:14 +01:00
Pau Pérez Fabregat
d422283b76
Merge pull request #2128 from mkllnk/2113-i18n-config
...
2113 Display only selected languages in switcher
2018-03-23 15:06:47 +01:00
Pau Pérez Fabregat
13115d4a2d
Merge branch 'master' into email/manager_invite
2018-03-23 12:56:10 +01:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Pau Pérez Fabregat
3788ec590f
Merge pull request #2166 from coopdevs/configure-mails-from
...
Configure mails_from
2018-03-23 12:19:31 +01:00
stveep
8a783bbb7d
PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting
2018-03-23 17:37:50 +11:00
stveep
dc76b3922b
Add sorting to query for producer mailer
2018-03-23 17:37:50 +11:00
stveep
40506685ef
Adding extra sort step for variant name; ignore case in sorting line items by name
2018-03-23 17:37:50 +11:00
Duende13
ba37db7ccc
Refactoring test to adopt most Rspec syntax (expect instead of should)
2018-03-23 17:37:50 +11:00
Duende13
330e7d71af
Sort line items by name and unit_value for confirmation email and summary screen
2018-03-23 17:37:50 +11:00
Pau Perez
2c588847df
Pick from_address from MailMethod as in Spree
...
Spree::Config[] picks it up from AppConfiguration rather than MailMethod
and so, gets a value different from the one configured.
2018-03-22 18:36:41 +01:00
Pau Perez
d8dd84e64e
Fix enterprise filter in customers page
...
Angular's filter function uses a pattern object to filter specific
properties on objects contained by the array. We want an exact match
instead, which has to be done by means of a function.
2018-03-21 19:16:14 +01:00
Pierre de Lacroix
28bb15f4a9
Fix old rspec syntax
2018-03-20 12:21:27 +01:00
Pierre de Lacroix
e0b12b1332
Remove dependency on model method in feature test
2018-03-20 12:18:54 +01:00
Pierre de Lacroix
2ceecc3d6e
Test Order#tax_adjustment_totals with taxed adjustment on order
2018-03-20 12:18:51 +01:00
Pierre de Lacroix
03de6c690c
Fix incorrect tax amount on Admin Order #show
...
by calling Order#tax_adjustment_totals from
Order#price_adjustment_totals
2018-03-20 12:18:09 +01:00
Pau Perez
977c8f6203
Stick to setup+execution+assertion order in tests
2018-03-20 12:07:10 +01:00
Matt-Yorkley
1600067383
Redirect to set password page after invite
2018-03-16 17:32:40 +00:00
Matt-Yorkley
5f0075f8b7
Refactor to use new REST resource
2018-03-16 17:32:38 +00:00
Pau Perez
a7f1ed660b
Add service to create a mail method
...
This will make loading sample data into staging environments easier.
2018-03-16 13:33:20 +01:00
Maxime Lalisse
fa68dd0bcc
refactor spec and check price
2018-03-16 01:18:21 +01:00
Matt-Yorkley
128ca3b1ef
Invite manager specs
2018-03-15 18:48:47 +00:00
Pau Pérez Fabregat
586a9afaae
Merge pull request #2125 from KeirOsborn/order_order_cycle_list_#1884
...
Order order cycle list #1884
2018-03-14 19:08:28 +01:00
Matt-Yorkley
e8bc87e62b
Ensure email validation link returns to /register paths properly
2018-03-14 12:13:45 +11:00
