Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Luis Ramos
f061545a92
Merge pull request #5995 from andresgutgon/fix/datetime-picker-ui-pick-the-right-translations-on-order-cycles
...
Fix date time picker translations on Order cycles screen
2020-09-17 11:50:37 +01:00
Luis Ramos
e99fdeb972
Merge pull request #5996 from andresgutgon/fix/iframe-shop-failing-because-jquery-is-not-loaded
...
Fix embedded shops failing javascript because jQuery is try to be accessed before being loaded
2020-09-17 11:32:08 +01:00
Luis Ramos
6f59158153
Remove useless TODOs
2020-09-10 17:36:25 +01:00
andresgutgon
2297e20c78
Fix embedded shops failing javascript because jQuery is try to be
...
accessed before being loaded
Show we check for $.ready when jQuery is not downloaded yet in the
browser. The solution is to check if document is ready with plain DOM
javascript event `DOMContentLoaded`
2020-09-06 15:24:22 +02:00
andresgutgon
d1331ac78a
Fix datetime picker translations on Order cycles screen
...
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
2020-09-06 13:43:35 +02:00
Eduardo
11684dae65
hide environment on payment methods when user is not admin
2020-09-04 08:45:57 -03:00
Luis Ramos
e44efd3db2
Change test of attachment from present? to file?
2020-09-04 10:06:41 +01:00
Luis Ramos
a3e9226878
Add option to remove existing terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Luis Ramos
5a10a2861e
Reduce the size of the terms and conditions message on the checkout page
2020-08-31 17:40:34 +01:00
Luis Ramos
aedc12e0e3
Add top padding to terms file upload input in enterprises form
2020-08-31 17:40:34 +01:00
Luis Ramos
b9511d4f07
Show terms and conditions on checkout if enterprise has an associated PDF file
2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +01:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
Maikel
819a445547
Merge pull request #5712 from mbudm/issue/5208
...
Add payment details to invoice
2020-08-28 09:46:49 +10:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
Pau Pérez Fabregat
300e12371a
Merge pull request #5918 from luisramos0/stripe_disabled
...
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-27 13:27:40 +02:00
Maikel
7a0b036edd
Merge pull request #5899 from andrewpbrett/dashboard-link
...
Update dashboard link to point to enterprise shop
2020-08-27 10:53:43 +10:00
Maikel
d81ed36eef
Merge pull request #5892 from arku/fix/price-i18n
...
Fix price translation in Bulk Order Management
2020-08-27 10:31:38 +10:00
Maikel
cad79d74c8
Merge pull request #5696 from jeduardo824/enhancement/5210-action-buttons-on-all-tabs
...
Enhancement/5210 - Add Actions dropdown menu to all pages of Order Details menu
2020-08-25 15:39:50 +10:00
Luis Ramos
19b5a004dd
Merge pull request #5877 from Matt-Yorkley/bugsnagger
...
BugsnagJS checkout errors
2020-08-21 14:01:48 +01:00
Matt-Yorkley
2f1fdc5852
Simplify conditional statement
2020-08-21 12:12:30 +01:00
Maikel
0309a20cb1
Merge pull request #5904 from Matt-Yorkley/favicon
...
Fix broken favicon path
2020-08-21 14:05:00 +10:00
Gaetan Riou
f71013c514
rename query filter where it was missed, fix bulk_update_product spec
2020-08-21 11:46:36 +10:00
Gaetan Riou
7356d0fe77
move url filter functionality to service ProductFiltersService
2020-08-21 10:42:02 +10:00
Gaetan Riou
bba683469b
add product filter parameters on the group buy options and search pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
c6e1f458cc
add product filter parameters on the various product properties pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
a6444e76a5
add product filter parameters on the various product image pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
459708dbc8
add product filter parameters on the various product variants pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
f75aaf0b45
extract product filter functionality to a helper
2020-08-21 10:19:53 +10:00
Gaetan Riou
6e5c168d3b
add filter parameters to link leading back to bulk import product page and preserve filter parameters when updating product
2020-08-21 10:19:53 +10:00
Gaetan Riou
39564e612f
on admin product page, add selected filter to url and apply filter from url on page load
2020-08-21 10:19:53 +10:00
Matt-Yorkley
07b819ab4b
Adjust payment state conditional
...
The `Spree::Order#paid?` method actually includes orders with `payment_state == "credit_owed"`, which was breaking the desired display logic here.
2020-08-20 17:16:20 +01:00
Steve Roberts
50fd3656ef
Fix tests - the move of payments to shared has wider impact than first thought (yay tests)
2020-08-20 17:16:20 +01:00
Steve Roberts
4243ff293f
Update invoice2 to also use the shared payment partial
2020-08-20 17:16:20 +01:00
Steve Roberts
ac69bef459
Fix issues raised by linter
2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97
Add more details on payments to invoice.
2020-08-20 17:16:20 +01:00
Luis Ramos
d1ef0e0a0b
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-18 16:41:29 +01:00
Matt-Yorkley
ed346b3b54
Add scrolling animate on sidebar hide
2020-08-17 13:41:06 +01:00
Matt-Yorkley
290120d015
Fix broken favicon path
...
Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
2020-08-17 11:59:22 +01:00
Matt-Yorkley
5f8fc64b31
Move layout adjustment from view to CSS
2020-08-15 12:18:41 +01:00
Matt-Yorkley
0b91991919
Add explanatory user message for viewing customer names
2020-08-14 20:48:33 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Andy Brett
d46fad3a02
remove map reference
2020-08-12 12:33:15 -07:00
Andy Brett
c75a864ff2
link to the enterprise's shop instead of a full map
2020-08-12 12:21:07 -07:00
Arun Kumar Mohan
13bf7497a9
Fix price translation in Bulk Order Management
2020-08-10 18:26:09 -05:00
Matt-Yorkley
1123e08a98
Update BugsnagJS to latest version and update initialization syntax
2020-08-07 12:59:33 +01:00
