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
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
Matt-Yorkley
358edb4727
Disable guest checkout in model
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
Pierre de Lacroix
28bb15f4a9
Fix old rspec syntax
2018-03-20 12:21:27 +01:00
Pierre de Lacroix
2ceecc3d6e
Test Order#tax_adjustment_totals with taxed adjustment on order
2018-03-20 12:18:51 +01:00
Pierre de Lacroix
03de6c690c
Fix incorrect tax amount on Admin Order #show
...
by calling Order#tax_adjustment_totals from
Order#price_adjustment_totals
2018-03-20 12:18:09 +01:00
Pierre de Lacroix
040c292a76
Fix some more old rspec syntax
2018-03-06 01:29:54 +01:00
Rob Harrington
b7876ebfbf
Replace references to 'standing order' with 'subscription' (spec)
2018-02-09 14:44:14 +11:00
Rob Harrington
02f474e16a
Fixing up spec data for orders spec
2018-02-09 14:43:55 +11:00
Rob Harrington
2231d4c6cf
Using factories to build spec data rather than StandingOrderForm
2018-02-09 14:43:54 +11:00
Rob Harrington
65db856054
Order confirmation emails are not sent for standing order orders.
2018-02-09 14:43:42 +11:00
Rob Harrington
2aad722b4b
WIP, SO placement job: preventing payments on standing orders from being processed when OC opens
2018-02-09 14:43:40 +11:00
Rob Harrington
59578a73af
Changing all references to 'be_true' and 'be_false' to 'be true' and 'be false'
...
See next commit for changes where this substitution was broken
2017-11-10 08:47:12 +11:00
Rob Harrington
ceadd386aa
Update order spec to test an order with a total > 0
...
This is necessary because the previous commit changed the logic
around payment state, meaning that a complete order with a total
of 0 and no complete paymnents is considered to have a payment
state of 'paid'. I don't think this is problematic, since it is
not possible to check out an order without line items.
This way the spec tests an order modelled on the real world.
2017-10-20 15:21:59 +11:00
Rob Harrington
b7976a2356
Do not update finalized fee adjustments
2017-10-19 16:54:39 +11:00
Rob Harrington
75ec77dc31
Remove the 'confirm' step from the order checkout flow
...
This step is not being responded to anyway, since we are not rending a page for each checkout step
It was causing an issue whereby an order in the 'confirm' state was not able to progress through the
checkout controller because it was expecting to only redirect to paypal from the 'payment' state.
figured it was easiest to just remove the step, seeing as it wasn't being used in any meaningful way.
It should be fine to bring the 'confirm' step back in the future if we need it, we will just have to
make sure paypal the paypal issue is resolved.
2017-09-23 15:15:06 +10:00
Enrico Stano
4a989f705b
No more order.payment
2017-09-08 23:55:49 +10:00
enricostano
cf4bd8d755
WIP Preparing to get rid of MailMethod model
...
Please give a look at the following links:
- http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#mailmethod-model-no-longer-exists
- https://github.com/spree/spree/pull/2643
2017-09-08 23:55:49 +10:00
Rohan Mitchell
38da4c8e12
Adjustments now have state instead of locked/unlocked
2017-09-08 23:55:48 +10:00
Rob Harrington
217eda8362
Shipping and payment fees are updated for completed orders when the order changes
2017-05-05 14:20:57 +10:00
Maikel Linke
db4a528ba3
Update shipment to re-calculate included tax
...
And re-create tax charges on the order. (untested)
2017-05-05 14:19:32 +10:00
Maikel Linke
479c7ba24b
Update transaction fees of completed orders
...
The adjustments associated to incomplete payments are re-calculated when
a line item is removed from a completed order.
2017-05-05 14:19:32 +10:00
Maikel Linke
1f08729df3
Update shipping fees after removing item
...
After removing an item from a completed order, update the shipping fees
of all shipments that are pending or ready (not completed).
2017-05-05 14:19:32 +10:00
Maikel Linke
65f62c42b9
Display products already ordered in this oc
...
Github issue #1083 , part of standing orders.
For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
Pierre de Lacroix
e854eb0426
add tests
...
for methods Spree::Order#tax_adjustment_totals
and Spree::Adjustment#find_closest_tax_rate_from_included_tax
2017-04-27 17:32:36 +10:00
Bing Xie
f7523ad88c
Create customer with default name and addresses
2016-10-21 10:51:36 +11:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rob Harrington
7028fbe288
Find current_customer via current_distributor and current_user rather than current_order
...
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
2016-05-28 00:31:59 +10:00
Rob Harrington
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
2016-05-27 16:25:10 +10:00
Rob Harrington
3fb6fba0f0
Adding payment method tag rule logic to Spree::Order.available_payment_methods
2016-05-27 16:25:10 +10:00
Rohan Mitchell
792e17c385
When removing variant from order, if not found then do nothing
2016-04-21 09:36:23 +10:00
Rob Harrington
0ed97d820c
Removing unrequired Spree::Order#with_payment_method_name scope
2016-04-02 01:04:09 +11:00
Rob Harrington
f902474591
Relevant DiscountOrder tag rules are applied to orders on update
2016-04-01 19:48:25 +11:00
Rohan Mitchell
257b5a9eef
Move premature Spree::Order#update prevention up a level, for even greater efficiency gains
2016-01-07 12:09:57 +11:00
Rohan Mitchell
e24027a8d0
Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee
2016-01-07 10:52:36 +11:00
Rohan Mitchell
d3c7c46800
Add method to remove a variant from an order
2015-11-13 14:03:07 +11:00
Rohan Mitchell
4fbeb0c3b1
Check if an order is an account invoice
2015-10-15 10:05:27 +11:00
Rob Harrington
160c0d75fe
Confirmation emails do not get send for orders distributed by accounts_distributor
2015-09-17 22:38:09 +10:00
Rob Harrington
34f5cfb6b5
Completed orders require a customer, add association logic
2015-05-13 12:44:38 +10:00
Maikel Linke
2b0f867ed8
new order method ready_to_ship?
2015-04-29 11:42:35 +10:00
Rohan Mitchell
e9fbd74e88
Send emails via jobs instead of synchronously
2015-04-16 16:54:43 +10:00
Rohan Mitchell
89d4a59e9d
Extract order total tax calculations to model
2015-03-25 16:27:29 +11:00
Rohan Mitchell
9650692699
Calculate total tax on enterprise fees for an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
7fb8370c36
Look up shipping tax on an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
d9f90be38a
Fix indentation
2015-03-13 10:52:44 +11:00
Lynne Davis
d9e8ce2f0e
Fix bug in report that selecting multiple payment methods didn't work. Added spec as well
2015-03-12 17:16:51 +11:00
Rohan Mitchell
e9f04c3c15
Clean up whitespace
2014-12-19 10:01:21 +11:00
Rohan Mitchell
4a30f27b3d
Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
spec/models/spree/order_spec.rb
2014-12-19 09:38:02 +11:00
Rob Harrington
dfb9e5bde5
Order reports now present the price of line items with adjustments included
2014-12-11 15:48:29 +11:00
