luisramos0
d598831d67
Adapt variants auto complete to spree v2 code with shipments
2019-02-04 18:59:41 +00:00
Hugo Daniel
c823f942b4
Fix failing specs due to Spree 2's new order admin page
...
Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
2019-02-04 18:57:51 +00:00
Hugo Daniel
ae799eb2b6
Use Spree routes
2019-02-04 18:56:28 +00:00
Isaac Haseley
09d3cea830
Lazy-load one more translation
2019-02-01 09:22:26 -06:00
Isaac Haseley
73a58435a8
Adopt one/other pluralization
2019-01-31 21:45:57 -06:00
Isaac Haseley
a18c98191a
Better accomodate different sentence structures
2019-01-31 21:45:57 -06:00
Isaac Haseley
8543bb7cfb
Add missing 'active products' translation on dashboard
2019-01-31 21:45:57 -06:00
Hugo Daniel
fa1525bdd3
Upgrade views to Spree 2 and apply overrides
2019-01-31 12:59:05 +01:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Pau Pérez Fabregat
8320dc75e8
Merge pull request #3002 from kevinchristianson/margin-fix
...
Fix bad spacing on account settings error page
2019-01-23 16:09:14 +01:00
nozakis
972bfd5e62
Fixed bad margins on the account settings error page.
2019-01-19 16:23:13 -06:00
Brases
3437257515
Fix wording in order confirmation email template
...
Fixes issue #3063 "Repeated translation in Order Confirmation Screen and Email".
Now "Ready for" (collection time) is not repeated in place of "Collection
details" (collection instructions)
2019-01-19 20:37:21 +00:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Matt-Yorkley
003014daf8
Extract invoice methods from ordersCtrl
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4a88fb0626
Use simpler array for selected ids
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f3585befff
Fix customer missing from some order records - guest checkout?
2019-01-10 09:57:06 +00:00
Matt-Yorkley
24207053e4
Reset selected orders on filter change
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5cc8bad42b
Improve UI layout for select all option
2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635
Disable button unless orders selected
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f263ef7dc0
Add selectable checkboxes
2019-01-10 09:57:06 +00:00
luisramos0
bdefc0ebd1
Fix admin orders spec by adapting the spec to the recently de-defaced page
2019-01-07 12:16:28 +00:00
Alvaro Chalar
6dccbeca70
Add custom footer message in reports section
2018-12-27 12:22:48 +01:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Maikel
84f2f9af3c
Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
...
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
luisramos0
5183c90c89
Add missing spree translations related to insufficient stock
2018-12-12 15:34:48 +00:00
Pau Pérez Fabregat
7834fa4d00
Merge pull request #3190 from luisramos0/2-0-new-product
...
[Spree Upgrade] Fix "new product" page specs and an html issue
2018-12-11 08:35:26 +01:00
haseleyi
835617159e
Add missing 'required field' stars in new product form
2018-12-10 18:02:39 -08:00
luisramos0
8fb103ce8d
Fix new_product div in new product page
2018-12-08 14:53:50 +00:00
Maikel Linke
cac4fa4816
Use I18n.t instead of Spree's JS t function
2018-12-07 23:38:05 +11:00
luisramos0
460e010408
Removed shipments from orders tab. This option is removed in spree 2
2018-12-05 11:38:16 +00:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Hugo Daniel
24dab58de7
Lazy load translations and add keys
2018-11-30 10:49:36 +01:00
Hugo Daniel
aa948552e1
Import payment_methods edit view and apply overrides
2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6
Import payment_methods form partial and apply overrides
2018-11-29 14:58:06 +01:00
Hugo Daniel
29bc4c52a5
Import payment_methods#new view and apply overrides
2018-11-29 14:56:28 +01:00
Pau Pérez Fabregat
3ea7fac25f
Merge pull request #3095 from luisramos0/admin-users-transl
...
In admin/users, convert Spree.t calls to t calls and use lazy lookup
2018-11-28 17:37:42 +01:00
Hugo Daniel
69e186f482
Define dynamic classes in variables as a turnaround to HAML bug
2018-11-28 10:31:47 +01: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
Hugo Daniel
60214b9a90
Fix failing specs
2018-11-28 10:31:47 +01:00
Hugo Daniel
422a68630f
Remove data-hook tags
2018-11-28 10:31:47 +01:00
Hugo Daniel
652191a4c5
Fixing missing variable none
2018-11-28 10:31:47 +01:00
Hugo Daniel
c233ea38cf
Import Spree views for orders#edit in our codebase and integrate deface modifications
2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat
5c8a638320
Merge pull request #3055 from HugsDaniel/3051-products-edit-views
...
[Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides
2018-11-27 17:32:25 +01:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Pau Pérez Fabregat
6a1776b84a
Merge pull request #3053 from HugsDaniel/3050-products-new-views
...
[Defacepocalypse] Import products#new view into our codebase and apply overrides
2018-11-21 14:43:22 +01:00
luisramos0
783e0eed3c
In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml
2018-11-21 11:46:14 +00:00
luisramos0
d282823d3a
Fix missing translation in user transaction history
2018-11-18 16:15:35 +00:00
Pau Perez
23bda74ecb
Match name of filter and db column for consistency
2018-11-15 19:09:17 +01:00
