Matt-Yorkley
598677be3f
Disable guest checkout for registered users
2018-05-11 12:05:26 +10:00
Maikel Linke
7b06abd4c2
Fix initial password setting
2018-05-01 14:18:56 +10:00
Matt-Yorkley
a08b095547
Extract json render from :user_confirmed? method
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1c57f0f241
Update :return_url value when re-sending email confirmations
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1f23402912
Disable password reset for unconfirmed users
2018-04-27 12:37:42 +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
76fe1c7ee9
Auto correct Rubocop's Layout/IndentAssignment cop
2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6
Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop
2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Pau Perez
746fcd5802
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
2018-04-09 18:47:17 +02:00
Rob Harrington
ce56e667a4
Use union operator instead of concatenate to load order cycle collection
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
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
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
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
Matt-Yorkley
b64327fbb3
Invite enterprise manager functionality
2018-03-15 18:48:47 +00:00
Matt-Yorkley
e8bc87e62b
Ensure email validation link returns to /register paths properly
2018-03-14 12:13:45 +11:00
Matt-Yorkley
d7a3c50bd5
Remove underscore from resource
2018-03-14 12:13:45 +11:00
Matt-Yorkley
595bc5d1a5
Show confirmation message in modal
2018-03-14 12:13:45 +11:00
Matt-Yorkley
bc621a3c43
Return user to same URL from confirmation link
2018-03-14 12:13:45 +11:00
Rob Harrington
b98afc00ba
Show message about resumable orders when unpausing a subscription
2018-03-07 14:24:59 +11:00
Pau Pérez Fabregat
0fdd7dabd4
Merge pull request #2026 from Matt-Yorkley/uk/embedded_headers
...
Only include one host in embedded shopfront headers
2018-03-06 11:07:32 +01:00
Rob Harrington
904a364bf1
Stop unnecessarily passing fee_calculators around
2018-03-02 10:11:26 +11:00
Rob Harrington
30df1d4345
Refector controller to allow price_estimate calculation
2018-03-02 10:11:26 +11:00
Matt-Yorkley
7bd0de99ac
Adjust brittle referer header check
2018-02-23 16:35:46 +00:00
Matt-Yorkley
e173f823c8
Refactor embedded logic
2018-02-23 15:57:28 +00:00
Matt-Yorkley
4a818c07bb
Only include one host in embedded shopfornt headers
2018-02-23 15:57:28 +00:00
Rob Harrington
ae1c8344d1
Ensure price estimates generated for subscriptions take overrides into account
2018-02-22 16:16:49 +11:00
Hugo Daniel
3fa5ca7eae
Use accessible_by method instead of involving_managed_distributors method to fetch all order cycles
2018-02-21 17:33:28 +11:00
Hugo Daniel
65fea6291e
CodeClimate requested changes
2018-02-21 17:33:28 +11:00
Hugo Daniel
64c2bdda1c
Added loading of all active or complete order cycles concerned by the current user to the reports form collection
...
User will see all order cycles he is concerned by as producer, distributor or coordinator
2018-02-21 17:33:28 +11:00
Matt-Yorkley
8a11dc3c33
Decouple image upload from Spree
2018-02-14 13:46:05 +00:00
Matt-Yorkley
7d27d1325e
Bulk Edit image upload
...
Image Upload Translations
Squashme
Squashme
Squashme
Code review tweaks
2018-02-14 13:46:05 +00: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
17a0b18e50
Reduce cognitive complexity of StandingLineItemsController#build
2018-02-09 14:44:12 +11:00
Rob Harrington
84ad996ef8
Use guard clauses
2018-02-09 14:44:07 +11:00
Rob Harrington
03f1980b1b
Auto-correct rubocop offences for standing-orders
2018-02-09 14:44:07 +11:00
Rob Harrington
d6a9d63de5
Replace StandingOrderSyncJob with ProxyOrderSyncer service object
2018-02-09 14:44:06 +11:00
Rob Harrington
bdac68900f
Move address and card loading logic down into DetailsController
...
Also switch to using CreditCardResource to load the card
2018-02-09 14:44:05 +11:00
Rob Harrington
ca1485f121
Add missing translations for proxy order controller error messages
2018-02-09 14:44:04 +11:00