Maikel Linke
1e80487afc
Compile Order And Distributors only on search
...
And move most logic into the report class like the others.
2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2
Compile Orders & Fulfillment report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5
Compile Payments report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f
Compile Bulk Co-Op report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19
Compile Products & Inventory report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027
Don't compile Sales Tax report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2
Don't compile xero report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138
Don't compile customers report data before search
...
Distributors, suppliers and order cycles are still loaded for the search
form.
2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0
Don't compile user-enterprises report before search
2018-05-18 11:27:47 +10:00
Maikel Linke
fcd41c67fa
Add logic for showing empty reports initially
2018-05-18 11:27:47 +10:00
Maikel Linke
031c4d417e
Simplify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
41bb5e4e96
Unify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
f3d542a3ec
Fix style and spelling
2018-05-18 11:27:46 +10:00
Maikel Linke
36b5f0eea7
Render only displayed report options
2018-05-18 11:27:46 +10:00
Maikel Linke
742e9d2a5f
Remove more code duplication
2018-05-18 11:27:46 +10:00
Maikel Linke
6a52ca8113
Remove code duplication
2018-05-18 11:27:46 +10:00
stveep
6efc0ab802
Set response headers to disable cache - to avoid back button emptying cart ( #1213 )
2018-05-18 09:57:32 +10:00
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