Luis Ramos
cc3361aaac
Merge pull request #5659 from dmarcoux/issue-5555
...
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Dany Marcoux
3dfabdc117
Filter orders on inclusive dates in admin/orders
...
Closes #5555
Co-authored-by: Luis Ramos <luisramos0@gmail.com >
2020-07-05 20:12:16 +02:00
Matt-Yorkley
46c40bdf33
Fix default image display in admin order edit
2020-07-03 22:58:29 +02:00
Matt-Yorkley
d2db9b3a66
Merge pull request #5599 from luisramos0/submit_on_enteer
...
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Luis Ramos
658c77f3f5
Merge pull request #5701 from Matt-Yorkley/noimage
...
Noimage
2020-07-02 20:17:04 +01:00
Pau Pérez Fabregat
28376b1056
Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
...
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Pau Perez
8c371fd0d1
Do not print bill addr. in invoice2 either
2020-07-01 11:27:57 +02:00
Pau Perez
23178763b0
Do not print the bill addr. name when there's none
...
The error
```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```
happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.
This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Matt-Yorkley
b441ac2644
Update paths to "noimage" images
2020-06-29 20:07:08 +02:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Luis Ramos
93a2e57bc6
Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
...
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +01:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Matt-Yorkley
7cc47d652c
Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile
...
v3 image precompile
2020-06-18 12:01:23 +02:00
Luis Ramos
d0bb625c19
Merge pull request #5593 from coopdevs/fix-report-order-link
...
Fix link from report to order
2020-06-17 19:55:40 +01:00
Matt-Yorkley
add38bf550
Use #image_path helper correctly
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Luis Ramos
e6e4b6f95c
Add keypress events to text input fields on orders search page
2020-06-13 12:15:49 +01:00
Luis Ramos
1740879261
Revert directive and just use ng-kkeypress
2020-06-13 12:07:45 +01:00
Luis Ramos
f08b837115
Make enter submit the search form in products list
2020-06-13 11:51:00 +01:00
Eduardo
5ed5ed2873
fix payment methods table to show proper provider name
2020-06-12 18:26:54 -03:00
Pau Perez
6a7df0b165
Fix link from report to order
2020-06-12 12:26:56 +02:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat
bc8a10c6a0
Merge pull request #5541 from luisramos0/has_variants
...
Delete dead code related to products without variants
2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
01a9b33fc9
Merge pull request #5482 from rmklaus12/5094-new-order-translation
...
created partial for order page title to resolve French translation of…
2020-06-11 13:23:28 +02:00
Luis Ramos
ccf6cbb003
Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation
...
Changed translation syntax to normal t() call and lazy lookup.
2020-06-10 23:00:44 +01:00
Luis Ramos
13a4a3edbe
Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight
...
Fix admin config separator without highlight
2020-06-10 23:00:30 +01:00
Luis Ramos
1e248c1848
Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method
...
Enhancement/5277 be able to filter orders according to shipping method
2020-06-10 20:50:06 +01:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Robin Klaus
d5d6fbc01d
created partial for order page title to resolve French translation of new order
2020-06-05 11:27:51 +10:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
072da7316e
Remove views code that tests for the existence of product variants
...
A product always has the standard variant, the only case where a product will not have variants is immediatly after creation and before being saved
2020-06-01 14:09:14 +01:00
Lucas Hiago
528db54f36
Correct controller name for matching
2020-05-29 22:24:41 -03:00
Lucas Hiago
19ef66f3ad
Change mail method config route
2020-05-29 21:51:57 -03:00
Luis Ramos
bec798c6c9
Bring some spree translations to ofn in payment methods pages
2020-05-28 19:51:23 +01:00
Luis Ramos
fe6bcb5093
Add de-activation warning to payment methods edit page
2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080
Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method
2020-05-28 19:50:58 +01:00
Robin Klaus
50a63139e3
Changed translation syntax to normal t() call and lazy lookup.
2020-05-26 15:14:26 +10:00
Luis Ramos
cb0aefd29c
Make display on attribute available for managers to change, not just super admins
2020-05-25 11:21:53 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Robin Klaus
53c0bcbd0b
Changed translation syntax to normal t() call and lazy lookup.
2020-05-22 13:22:57 +10:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
cf0ad179a1
Move hubs_sidebar to the last 4 columns at the top of the page
2020-05-21 10:45:58 +01:00
Eduardo
473b4c63c4
add Shipping Method filter to admin/orders page
2020-05-18 18:46:43 -03:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
40dd307a35
Remove shipping method display on front_end option, it is not working and it's not straight forward to make it work correctly
2020-05-08 12:00:58 +01:00
Luis Ramos
c9b60d0f62
Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page
...
Show outstanding balance on orders page
2020-05-07 16:03:58 +01:00
Mathew Button
e088b27a13
Always display the outstanding balance if not zero
2020-05-06 16:45:44 +10:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Mathew Button
fe6c810505
Add brackets in view instead of API response
2020-05-04 19:09:18 +10:00
Luis Ramos
e2b26b2e9c
Replace break with if
...
What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units
2020-05-03 12:00:23 +01:00
