Pau Perez
0cbd967007
Remove in_stock dead scope
...
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
2018-03-28 12:13:34 +02:00
Pau Pérez Fabregat
dadc02fb11
Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails
...
Uk/1663variant order emails
2018-03-23 15:29:05 +01:00
Pau Pérez Fabregat
bbd2427493
Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages
...
i18n for admin/orders
2018-03-23 15:27:55 +01:00
stveep
231dd7b6a2
Add some rubocop spaces
2018-03-23 17:37:50 +11:00
stveep
8a783bbb7d
PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting
2018-03-23 17:37:50 +11:00
stveep
40506685ef
Adding extra sort step for variant name; ignore case in sorting line items by name
2018-03-23 17:37:50 +11:00
Duende13
f5ad950bc3
Change Syntax from :variant => :product to variant: :product
2018-03-23 17:37:50 +11:00
Duende13
401052be68
Fix Robcop issues (blank spaces and indentation)
2018-03-23 17:37:50 +11:00
Duende13
330e7d71af
Sort line items by name and unit_value for confirmation email and summary screen
2018-03-23 17:37:50 +11:00
Pau Perez
3c36d2d1a6
Remove failing mails_from default
...
As example.com is not a verified domain, Mandrill rejects the email
giving "reject_reason": "unsigned". Also, the mails_from setting is
already defined as a MailMethod preference.
2018-03-22 13:02:57 +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
Pau Pérez Fabregat
976bbd8725
Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator
...
Remove deprecated reference to Spree::MailMethod
2018-03-13 08:51:11 +01:00
Pau Perez
1b39d57800
Remove deprecated reference to Spree::MailMethod
...
Said class is removed in https://github.com/spree/spree/pull/2643 in
Spree.
2018-03-07 16:24:39 +01:00
Rob Harrington
28491ee948
Skip stock check when requested quantity is zero
...
This prevents an error being raised when available stock is negative
2018-03-02 14:53:24 +11:00
Maxime Lalisse
11eda94949
Add i18n for admin/orders
2018-02-09 17:40:31 +01:00
Rob Harrington
7017c8540c
Replace references to 'standing line item' with 'subscription line item'
2018-02-09 14:44:15 +11:00
Rob Harrington
672f96b85b
Replace references to 'standing order' with 'subscription'
2018-02-09 14:44:13 +11:00
Rob Harrington
c5f3249172
Fix rubocop issues
2018-02-09 14:44:12 +11:00
Rob Harrington
e7eb02dfe3
Reduce cognitive complexity of VariantsController#search
2018-02-09 14:44:12 +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
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
25907d8969
Prevent standing order form from accepting non cash/stripe payment methods
2018-02-09 14:44:03 +11:00
Rob Harrington
07a7993109
Require a Cash or Stripe payment method in standing order setup process
2018-02-09 14:44:03 +11:00
Rob Harrington
6081db382c
Updating addresses on standing order updates addresses on any initialised orders
2018-02-09 14:44:03 +11:00
Rob Harrington
6ac49a7694
Adding route and controller action for searching for customer addresses using AddressFinder
2018-02-09 14:44:00 +11:00
Rob Harrington
3d3013a592
WIP: ProxyOrders don't require an order, adding an edit path for proxy orders
...
initialises an order if one does not exist and redirects to its edit path
2018-02-09 14:43:55 +11:00
Rob Harrington
e351c3e355
Renaming StandingOrderOrder to ProxyOrder
2018-02-09 14:43:54 +11:00
Rob Harrington
8e0f2fcb35
Adding optional manual override of line item stock level check
2018-02-09 14:43:54 +11:00
Rob Harrington
8ff9ffbc38
Adding controller actions and routes for pausing and unpausing a standing order
2018-02-09 14:43:52 +11:00
Rob Harrington
7dcf7ec5b0
Adding controller action and route for cancelling a standing order
2018-02-09 14:43:51 +11:00
Rob Harrington
d1ca9a6e14
Adding a #resume action to StandingOrderOrdersController
2018-02-09 14:43:49 +11:00
Rob Harrington
7644f08d5c
Individual StandingOrder orders can be cancelled from Standing Order index
2018-02-09 14:43:48 +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
5598a0d24f
line_item.unit_value delegates to variant when quantity is 0 or final_weight_volume is missing
2018-02-09 14:43:41 +11:00
Rob Harrington
1c7e9923f9
Checking for sufficient stock takes variant overrides into account
2018-02-09 14:43:41 +11:00
Rob Harrington
a8928a0ccc
Capping line item quantity at stock takes overrides into account
2018-02-09 14:43:40 +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
178aadb311
WIP, SO placement job: Finding orders to be placed
2018-02-09 14:43:39 +11:00
Rob Harrington
9468dcb406
Adding lib class to maintain standing order orders
2018-02-09 14:43:38 +11:00
Rob Harrington
38d75d2b1c
Standing Orders: adding routing and controller action for deleting standing line items
2018-02-09 14:43:37 +11:00
Rob Harrington
1b711bcd46
Standing Orders can be edited
2018-02-09 14:43:37 +11:00
Rob Harrington
91917886a8
Adding basic routing and templates for standing orders index
2018-02-09 14:43:32 +11:00
Rob Harrington
946046e53b
Moving action for estimating standing_line_item prices into StandingLineItemController#build
2018-02-09 14:43:31 +11:00
Rob Harrington
e661430cc9
StandingLineItems added to StandingOrder are saved
...
Adding some additional validation
2018-02-09 14:43:30 +11:00
Rob Harrington
415955e7b3
SO: Adding variants to a new standing order, price estimate provided
2018-02-09 14:43:30 +11:00
Rob Harrington
6934b87816
SO: Adding basic interface for Standing Order creation
2018-02-09 14:43:29 +11:00
Rob Harrington
8c0bad3115
Schedules can be deleted from OC index
2018-02-09 14:43:28 +11:00
Rob Harrington
357040f67a
Enterprise User can create and update schedules via OC index
2018-02-09 14:43:28 +11:00
