Pau Pérez Fabregat
7bf27ec6b3
Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors
...
2013 Remove dead code for Spree upgrade
2018-07-18 10:38:19 +02:00
Rob Harrington
edde929ced
Replace uses of #stub with #allow in Admin::CustomersController
2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c
Remove unrequired #cards and #addresses actions from Admin::CustomerController
2018-07-05 19:26:12 +10:00
Rob Harrington
cf8ca1f8c1
Add show action to Admin::CustomersController
2018-07-05 19:26:11 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
Maikel Linke
b7de80dd7f
Remove unused count_on_hand setting from spec
...
This spec doesn't need to set the product's `count_on_hand`. The product
comes with a count of 3, but what matters is the count of variants.
2018-06-27 11:41:55 +10:00
Rob Harrington
ddb9ae1140
Load all shops that a user is associated with as a customer
...
Regardless of the presence of an order
2018-06-24 16:28:47 +10:00
Rob Harrington
ffa8a8c7d6
Create Api::BaseController to allow use of ActiveModelSerializers
...
Also add index action to Api::CustomersController
2018-06-22 15:39:47 +10:00
Rob Harrington
6e76fd8164
Add Api::CustomersController with update action
2018-06-22 15:39:46 +10:00
Rob Harrington
25525ae30b
Move applicator calls to OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
d9830749f1
Extract schedule syncing logic into OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
21bd9d2e10
Add basic specs for OrderCyclesController#create
2018-06-22 09:46:08 +10:00
Maikel
3399eba428
Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel
...
Move product bulk edit to product index route
2018-06-20 17:53:57 +10:00
Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Matt-Yorkley
ea0d24a5bf
Re-word test names for clarity
2018-06-12 13:20:00 +01:00
Matt-Yorkley
c7f7541e2d
Admin order customer details spec
2018-06-10 02:32:59 +01:00
Rob Harrington
1327b9dc2c
Add update method to CreditCardsController
2018-06-08 15:30:07 +10:00
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
