luisramos0
58ea28ebb4
Make Api::ShipmentsController#create re-use order.shipment if it exists
...
Improve code and add specs to this controller
2019-02-12 10:09:00 +00:00
luisramos0
0f44beb477
Delete all Spree::Admin::LineItemsController customizations as they are no longer used
2019-02-12 10:09:00 +00:00
Luis Ramos
edd1da7d50
Update spec/controllers/spree/orders_controller_spec.rb
...
Fix typo in doc
Co-Authored-By: sauloperez <saulopefa@gmail.com >
2019-02-12 09:12:03 +01:00
luisramos0
ad0e5bb093
Re implement orders ctrl update method so we can change redirection logic and add specs for it
2019-02-10 15:31:01 +00:00
Kristina Lim
461b5725d1
Hide report link and resource from non-superadmins
2019-02-08 21:26:38 +00:00
Kristina Lim
eaa7800427
Do not assign I18n translation to constants
...
The preferred language could change dynamically.
2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a
Separate enterprise fee summary action
...
Split the previous "index" action into "new" and "create" actions.
2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131
Rename EnterpriseFeeSummaryReportController
...
Remove "Report" because this is redundant, and pluralize the resource
name.
2019-02-08 21:26:38 +00:00
Kristina Lim
d3e9a53120
Filter enterprise fee summary for user permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a
Authorize filters before generating enterprise fee report
2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f
Add basic action for enterprise fee summary
2019-02-08 21:26:37 +00:00
Pau Perez
f998748634
Clarify why we end up with 3 adjustments
...
And the second one is open.
2019-02-08 18:16:00 +01:00
luisramos0
3dc75c88d2
Delete empty controller class eval and spec. Useless left overs from 0ad2978926
2019-02-08 09:29:58 +00:00
Pau Perez
cde465edad
Fix orders controller spec
2019-02-07 16:05:18 +01:00
Matt-Yorkley
2c3eeec2b9
Update cancan permissions for second iteration of bulk invoices
2019-02-06 18:19:53 +00:00
Maikel
155b205ac2
Merge pull request #3401 from luisramos0/2-0-stable-jan-29th
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
2019-01-30 14:44:40 +11:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Pau Perez
f4b790eefa
Restore adjustments state after updating
...
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd
Trigger the appropriate callbacks from controller
2019-01-29 09:40:54 +01:00
Pau Perez
0b62b4621f
Make expectation easier to reason about
2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7
Make controller req. params a bit more obvious
2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d
Restore distributor in test that relies on it
2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a
Do not modify config's state in test
2019-01-29 09:40:53 +01:00
Matt-Yorkley
66ac61f591
Rename background processing method
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6
Add Service and remove Job
2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657
Move bulk invoice to new RESTful route
2019-01-10 09:57:06 +00:00
luisramos0
a5bf7a1f35
Adapt payment controller spec to spree 2
...
In spree 2, since 5ed6015916 , to fire a payment event the order needs to be in either payment or complete state
2018-12-14 16:04:19 +00:00
Pau Perez
43cacfc2fc
Fix redirection on admin/products controller specs
...
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.
Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
2018-12-12 13:10:39 +01:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Hugo Daniel
65dd3eb5b9
Change line items controller HTML response spec to look for form order_edit class
2018-11-28 10:31:47 +01:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Hugo Daniel
a08ddd8171
Use :user factory instead of build_stubbed to create the current_api_user
2018-11-22 14:29:37 +01:00
luisramos0
b40c0e5b80
Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default
2018-11-17 12:11:23 +00:00
Maikel
5ecea06098
Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl
...
[Spree Upgrade] Fix credit card controller
2018-11-16 10:43:16 +11:00
Hugo Daniel
4e29589be0
Add specs for cloning a product with image
2018-11-15 13:51:40 +01:00
luisramos0
9ba0fc268e
Run transpec and clean up rubocop issues in credit_card_controller and spec
2018-11-15 11:07:43 +00:00
luisramos0
9b894c6a55
Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5
2018-11-13 19:51:26 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Pau Perez
f7b6867c28
Perform mail delivery in spec to make it pass
...
We need to purposefully enable deliveries for the deliveries array to
list this email. Otherwise the delivery logic is not executed and thus
the deliveries array never filled.
2018-11-05 17:49:08 +00:00
Pau Pérez Fabregat
3b85bbe911
Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs
...
Extract email setup in specs for easy upgrade
2018-11-02 15:40:19 +01:00
Matt-Yorkley
29492d61f9
Use #allow syntax
2018-10-26 21:38:57 +01:00
Matt-Yorkley
8c19d1afec
Move tests from spree/admin/orders_controller_spec to api/orders_controller_spec and tidy up
2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Pau Perez
cbac916e66
Validate unit value when updating variant_unit
...
Variants whose product's variant_unit is weight or volume require
a unit_value.
2018-10-11 15:52:40 +02:00
luisramos0
1ff1e32398
Making reports and reports_controller specs pending, 18 tests to be fixed in issue #2792
2018-09-30 00:30:49 +01:00
Luis Ramos
0eb2854f8a
Merge pull request #2680 from luisramos0/2-0-stable-x
...
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +01:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00