Maikel Linke
45fc42723c
Simplify query for existing email
...
It should be easier to read and more efficient now.
2018-05-11 12:05:27 +10:00
Maikel Linke
fe979b801f
Improve readability by grouping depending logic
2018-05-11 12:05:27 +10:00
Matt-Yorkley
358edb4727
Disable guest checkout in model
2018-05-11 12:05:27 +10:00
Matt-Yorkley
b431a7417a
Add cancan permissions for Admin::ManagerInvitationsController
2018-04-27 10:13:54 +10:00
Pau Pérez Fabregat
1abfe2ab8c
Merge pull request #2199 from coopdevs/auto-correct-cops
...
Auto correct cops
2018-04-16 14:58:28 +02:00
Pau Perez
147a74f005
Fix Rubocop violations reported by Code Climate
2018-04-16 10:27:44 +02:00
Pau Perez
1640d5ad0b
Auto correct Rubocop's Layout/IndentHeredoc cop
2018-04-09 18:47:18 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Pau Perez
e4c86df7b2
Auto correct Rubocop's Layout/CaseIndentation cop
2018-04-09 17:19:47 +02:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +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
Hugo Daniel
f40bd9cfcb
Fixing wrong incrementation
2018-04-04 14:58:47 +10:00
Hugo Daniel
843bca9ea3
Updated calculation for flexible rate
2018-04-04 14:58:46 +10:00
Hugo Daniel
14ea591c7d
Removed redundant self
2018-04-04 11:25:25 +10:00
Hugo Daniel
28009afbea
Calculate price sack fees and tests
2018-04-04 11:25:25 +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
Maikel
f9dbf61afc
Merge pull request #2176 from HugsDaniel/2002_calculator_options_not_translated
...
Overwrites spree_i18n translations for calculator's options
2018-04-04 08:17:18 +10: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
Hugo Daniel
6731dd0b64
Overwrites spree_i18n translations for entreprise fees calculator's options
2018-04-03 08:38:00 +10: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
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
bbd2427493
Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages
...
i18n for admin/orders
2018-03-23 15:27:55 +01:00
stveep
231dd7b6a2
Add some rubocop spaces
2018-03-23 17:37:50 +11: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
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
f5ad950bc3
Change Syntax from :variant => :product to variant: :product
2018-03-23 17:37:50 +11:00
Duende13
401052be68
Fix Robcop issues (blank spaces and indentation)
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
3c36d2d1a6
Remove failing mails_from default
...
As example.com is not a verified domain, Mandrill rejects the email
giving "reject_reason": "unsigned". Also, the mails_from setting is
already defined as a MailMethod preference.
2018-03-22 13:02:57 +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 Pérez Fabregat
976bbd8725
Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator
...
Remove deprecated reference to Spree::MailMethod
2018-03-13 08:51:11 +01:00
Pau Perez
1b39d57800
Remove deprecated reference to Spree::MailMethod
...
Said class is removed in https://github.com/spree/spree/pull/2643 in
Spree.
2018-03-07 16:24:39 +01:00
Rob Harrington
09ca9ac2dd
Alter scope to return both completed and resumed orders
2018-03-07 14:24:59 +11:00
Rob Harrington
b98afc00ba
Show message about resumable orders when unpausing a subscription
2018-03-07 14:24:59 +11:00
Rob Harrington
28491ee948
Skip stock check when requested quantity is zero
...
This prevents an error being raised when available stock is negative
2018-03-02 14:53:24 +11:00
Rob Harrington
31750a7bba
Add logic for calculator of fee estimates to SubscriptionEstimator
2018-03-02 10:11:26 +11:00
Rob Harrington
1ac9417a20
Add class description for ProxyOrder
2018-02-22 16:23:10 +11:00
Rob Harrington
d7d40a4a0f
Create new OrderFactory service object for initializing order from attr hash
2018-02-22 16:16:49 +11:00
Maxime Lalisse
11eda94949
Add i18n for admin/orders
2018-02-09 17:40:31 +01:00
Pau Perez
c79641c77c
Fix typos in documentation
2018-02-09 09:53:40 +01:00
Rob Harrington
7017c8540c
Replace references to 'standing line item' with 'subscription line item'
2018-02-09 14:44:15 +11:00
Rob Harrington
ae4420d9ba
Rename standing line item files
2018-02-09 14:44:14 +11:00
Rob Harrington
672f96b85b
Replace references to 'standing order' with 'subscription'
2018-02-09 14:44:13 +11:00
Rob Harrington
a9b5fd69d8
Renaming standing order files
2018-02-09 14:44:13 +11:00
Rob Harrington
c5f3249172
Fix rubocop issues
2018-02-09 14:44:12 +11:00
Rob Harrington
e7eb02dfe3
Reduce cognitive complexity of VariantsController#search
2018-02-09 14:44:12 +11:00
Rob Harrington
2012c23956
Reduce cognitive complexity of ProxyOrder#state
2018-02-09 14:44:12 +11:00
Rob Harrington
ce09a8dad6
Reduce cognitive complexity of StandingOrder#state
2018-02-09 14:44:11 +11:00
Rob Harrington
981b874263
Remove unused method active? for order cycles
2018-02-09 14:44:09 +11:00
Rob Harrington
8bf460c93a
Manually fix remaining rubocop offences
2018-02-09 14:44:08 +11:00
