Rob Harrington
11ccb9a6d2
Revert "Fix for #1826 , ensure that adjustment states are initialized prior to validation"
...
This reverts commit d7de7d462f
2017-09-22 11:16:29 +10:00
Continuous Integration
4cec7213b5
Merge remote-tracking branch 'origin/master' into HEAD
2017-09-22 10:07:55 +10:00
Rob Harrington
3f3085c66b
Add detailed explanation of why #destroy_orphaned_paypal_payments is required
2017-09-21 12:11:46 +10:00
Rob Harrington
f4b1c5de9c
Remove orphaned PayPalExpress payments when processing actual PayPalExpress payment
...
Fixes both #1074 and #1837
2017-09-21 12:11:39 +10:00
Julius Pabrinkis
1fe20eba45
Add backend to be able to switch language by param and persist in cookies and user db
2017-09-20 13:23:15 +10:00
Rob Harrington
d7de7d462f
Fix for #1826 , ensure that adjustment states are initialized prior to validation
2017-09-14 13:39:22 +10:00
Pau Perez
a763c24f3c
Doc what with_lock does
2017-09-08 23:55:51 +10:00
Enrico Stano
72292b1dd3
Use new state API instead of locked
...
be554fde9f
2017-09-08 23:55:49 +10:00
enricostano
4e35c0448b
Use the state machine API to add state transition callbacks
...
See the following links for more context:
http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#removal-of-checkoutcontrollerstatecallback
1d9581c884
2017-09-08 23:55:49 +10:00
enricostano
d2b6a47ae4
Use new #available_to_order API
2017-09-08 23:55:49 +10:00
Rohan Mitchell
bfaaf16030
Fix spree adjustments fix that maybe never worked?
2017-09-08 23:55:49 +10:00
Rohan Mitchell
0a043a6919
Add permissions to :line_item resource, now called by Spree
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rohan Mitchell
38da4c8e12
Adjustments now have state instead of locked/unlocked
2017-09-08 23:55:48 +10:00
Pau Perez
649c25622a
Add doc to method
2017-08-11 14:41:02 +10:00
Pau Perez
1f2820f6d4
Add #delivery? in ShippingMethod
2017-08-11 14:41:02 +10:00
Matt-Yorkley
113f6565be
Enable iframes for embedded shopfronts
2017-07-26 13:56:36 +10:00
Julius Pabrinkis
9fa7a30c7e
Fix failing tests and extract validation message Procs into methods
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9971c9f923
Extract translations from models
2017-07-21 12:17:12 +10:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
28ea23965b
Rubocop: Correct Lint/AmbiguousOperator offences
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Pierre de Lacroix
b879ea5a96
add comments
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
stveep
c1c5d00f45
Add new view to set distribution, ensure the scoped variant single item price is used.
2017-05-19 16:10:06 +10:00
Rob Harrington
5eadb33db9
Using changes_allowed? to authorize cancellation of line_items
2017-05-05 14:20:57 +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
Rob Harrington
579f3bf90a
Changing quantity and deleting line_items of completed orders works with inventory where present
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
5d9f92eaa7
Adding 'Cancel Order' button to order confimation interface
2017-05-05 14:19:32 +10:00
Rob Harrington
c6afa1849c
Basic routing for front-end OrdersController#cancel action
2017-05-05 14:19:32 +10:00
Rob Harrington
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Rob Harrington
5af8668560
Rewriting Spree::Taxons.distributed_taxons for better performance
2017-05-05 14:19:32 +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
219ad4a3a7
Reload bought products after choosing order cycle
2017-05-05 14:19:32 +10:00
Maikel Linke
d49469a3e6
Show bought items only if changes are allowed
...
An enterprise can decide to allow changes to orders in open order
cycles. The items of these orders are then displayed in the shopping
cart and can be removed on the cart edit page.
2017-05-05 14:19:32 +10:00
Maikel Linke
4835ef067f
Add feature to remove line items from open order cycle
...
- Add JS controller to send delete requests.
- Add resource controller to destroy items.
- Add authorisation check to abilities.
- Update fees after removing line item.
2017-05-05 14:19:32 +10:00
Maikel Linke
c0d6b68233
Apply some style guidelines to older code
2017-05-05 14:18:20 +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
4a9c17cb28
better tax aggregation
2017-04-27 17:32:36 +10:00
Matt-Yorkley
80d8d18eb2
Update terms of service config
2017-04-05 15:48:50 +10:00
Pierre de Lacroix
e94ae20b31
fix print_ticket authorization
2017-03-30 20:37:20 +02:00
Matt-Yorkley
6e5c878491
Product Import cancan permissions and ui tab
2017-03-17 16:11:52 +11:00
Rohan Mitchell
2cb3da56ab
Fix regression: Transaction fee double-charged
2017-03-17 12:02:13 +11:00
Rohan Mitchell
170101cbfe
Avoid reloading order during checkout request, which clears credit card number
2017-03-17 12:02:13 +11:00
Rob Harrington
bea0b2b1e5
Adding feature toggle for receipt printing using qz
2017-03-15 16:39:04 +11:00
Pierre de Lacroix
2fe25c6219
Allow both invoice layouts to coexist
...
Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts
2017-03-15 15:06:28 +11:00
