Maikel
cb19643b3a
Merge pull request #2332 from oeoeaio/1938-oc-switch
...
Correct 'Next Order Closing' text in shopfront when switching OCs
2018-05-30 08:28:23 +10:00
Rob Harrington
17259b3269
Overwrite cached value for current_order_cycle when updating it
...
This ensures that the correct order cycle is rendered in the json response
2018-05-25 17:28:54 +10:00
Pau Perez
889199a525
Refactor Overview Controller to make it more clear
...
Assigns meaningful names to the boolean conditions to make it easier
to understand, breaks down the big and nested if/else and converts the
specs to RSpec 3.
Note the check `!spree_current_user.admin?` has been removed because
in admin/base_controller_decorator.rb `#authorize_admin` is already
called.
2018-05-22 10:21:35 +02:00
Maikel Linke
40b0a0bd5a
Determine searching state by params, not request
...
We may want to use GET for searching or POST to display a certain report
type.
2018-05-18 11:27:48 +10:00
Maikel Linke
8a1a540f3d
Clarify creating objects for test context
2018-05-18 11:27:48 +10:00
Maikel Linke
8a4457e8e4
Give better names
2018-05-18 11:27:48 +10:00
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
983e128d90
Half test run time by loading less data
...
On my computer it took 3 seconds to load all four orders with all the
attached order cycles and enterprises.
Runtime before: 56.38 seconds
Runtime after: 25.14 seconds
This really speeds up developing reports.
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
99a6afd9cd
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/controllers/spree/admin/reports_controller_spec.rb
* 20 conversions
from: obj.should
to: expect(obj).to
* 14 conversions
from: obj.should_not
to: expect(obj).not_to
* 5 conversions
from: == expected
to: eq(expected)
* 4 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 2 conversions
from: obj.should_receive(:message)
to: expect(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
Matt-Yorkley
94b90b4a73
Registered user controller method spec
2018-05-11 12:05:27 +10:00
Daniel Dominguez
9d9a974295
Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
...
- Change FactoryGirl to FactoryBot everywhere on code.
2018-05-04 11:52:08 -03:00
Matt-Yorkley
1f23402912
Disable password reset for unconfirmed users
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1782a8c700
manager invite permissions spec
2018-04-27 10:13:54 +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
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
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
128ca3b1ef
Invite manager specs
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
f5a0862655
Email confirmation modal specs
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
Rob Harrington
ae1c8344d1
Ensure price estimates generated for subscriptions take overrides into account
2018-02-22 16:16:49 +11:00
Matt-Yorkley
fdc14ab44e
Add controller specs
2018-02-14 15:37:22 +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
b7876ebfbf
Replace references to 'standing order' with 'subscription' (spec)
2018-02-09 14:44:14 +11:00
Rob Harrington
902802594f
Renaming standing order files (lib, spec)
2018-02-09 14:44:13 +11:00
Rob Harrington
8bf460c93a
Manually fix remaining rubocop offences
2018-02-09 14:44:08 +11:00
Rob Harrington
fb28940952
Use Time.zone.now instead of Time.now
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
c94badbf36
Stub or provide mailer as appropriate
2018-02-09 14:44:04 +11:00
Rob Harrington
494f2f4821
Add cards lookup action to CustomersController
2018-02-09 14:44:04 +11:00
Rob Harrington
d3937e5c80
Move customer address lookup action to CustomersController
2018-02-09 14:44:03 +11:00
Rob Harrington
26b85052e1
Load only Cash and Stripe payment methods into standing order form actions
2018-02-09 14:44:03 +11:00
Rob Harrington
fce2d743e5
Adding proxy-order state to specs
2018-02-09 14:44:02 +11:00
Rob Harrington
ab5dc7ddd5
Require action from user when pausing/cancelling standing order with open orders
2018-02-09 14:44:02 +11:00
