Luis Ramos
|
0b053c18af
|
Merge decoorator with original file from spree
|
2020-09-01 09:42:24 +01:00 |
|
Luis Ramos
|
d13bd86e4c
|
Bring stocck movement and stock location from spree
|
2020-09-01 09:42:24 +01:00 |
|
Luis Ramos
|
208be3ede6
|
Fix rubocop issues
|
2020-08-31 20:00:08 +01:00 |
|
Luis Ramos
|
8a75fe777c
|
Refactor enterprises controller to reduce code duplication
|
2020-08-31 17:40:34 +01:00 |
|
Luis Ramos
|
66587ccc00
|
Allow user to remove terms and conditions file
|
2020-08-31 17:40:34 +01:00 |
|
Luis Ramos
|
24cdd0c467
|
Refactor enterprise controller to reduce code duplication
|
2020-08-31 17:40:34 +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
|
fc4cc65e07
|
Merge typography files in css admin
|
2020-08-31 17:40:34 +01:00 |
|
Luis Ramos
|
07cee32f04
|
Move enterprisse_console to pages/enterprise_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
|
bf07da6267
|
Fix the order resend message translation
|
2020-08-29 20:47:28 -05:00 |
|
Arun Kumar Mohan
|
bb9ab57699
|
Remove resend button on the orders edit page
|
2020-08-29 20:47:28 -05:00 |
|
Pau Pérez Fabregat
|
4984cc9758
|
Merge branch 'master' into ctry_zone
|
2020-08-28 09:21:57 +02:00 |
|
Maikel
|
819a445547
|
Merge pull request #5712 from mbudm/issue/5208
Add payment details to invoice
|
2020-08-28 09:46:49 +10:00 |
|
Maikel
|
d57f20a542
|
Merge pull request #4925 from luisramos0/finders
Adapt remaining AR finders to rails 4
|
2020-08-28 09:46:20 +10:00 |
|
Pau Pérez Fabregat
|
06b41a8236
|
Merge pull request #5908 from Matt-Yorkley/subs-logging
Improve subs logging
|
2020-08-27 16:23:15 +02: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 |
|
Steve Roberts
|
ef0038a661
|
Change trigger to update filters after ProductsCtrl is loaded.
|
2020-08-27 18:02:01 +10:00 |
|
Steve Roberts
|
4e635e114c
|
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072
|
2020-08-27 14:48:51 +10:00 |
|
Maikel Linke
|
5d48da72c7
|
Notify Bugsnag on Stripe payment errors
|
2020-08-27 11:09:16 +10:00 |
|
Maikel Linke
|
9d07295480
|
DRY error reporting during payment
|
2020-08-27 11:03:13 +10:00 |
|
Maikel Linke
|
f435039061
|
Simplify using loading and flash messages together
|
2020-08-27 11:03:13 +10:00 |
|
Maikel
|
7ce9a3f988
|
Merge pull request #5894 from julesemmac/places-error
adding required argument to resolve Places error
|
2020-08-27 11:01:19 +10: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 |
|
Luis Ramos
|
5b3e350204
|
Rename zone.country_list to zone.countries
|
2020-08-26 23:12:48 +01:00 |
|
Luis Ramos
|
53de04121c
|
Fix rubocop issue
|
2020-08-26 23:09:41 +01:00 |
|
Luis Ramos
|
9264badaaf
|
Merge pull request #5879 from luisramos0/payments
[Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core
|
2020-08-26 22:09:16 +01:00 |
|
Pau Pérez Fabregat
|
0421d23e7b
|
Merge pull request #5851 from cillian/osm-tile-provider-updates
Open Street Map tile provider updates
|
2020-08-25 10:51:55 +02: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
|
e616e32bbc
|
Merge pull request #5931 from Matt-Yorkley/customer-totals-fees
Customer totals fee calculations
|
2020-08-21 14:09:00 +01:00 |
|
Luis Ramos
|
19b5a004dd
|
Merge pull request #5877 from Matt-Yorkley/bugsnagger
BugsnagJS checkout errors
|
2020-08-21 14:01:48 +01:00 |
|
Luis Ramos
|
4a5a6a2242
|
Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors
Fix flash error issues in checkout requests
|
2020-08-21 13:03:30 +01:00 |
|
Luis Ramos
|
d1b60e3778
|
Merge pull request #5905 from mkllnk/lost-decorators
Load previously lost decorator code and don't delete orders
|
2020-08-21 12:34:37 +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
|
6564ea7b00
|
rename ProductFiltersService to ProductFiltersUrl
|
2020-08-21 12:13:16 +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
|
44487af2c8
|
remove dead filter code
|
2020-08-21 11:40:48 +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
|
9b26ff2fa4
|
move product filter helper to a service
|
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 |
|