Matt-Yorkley
4d9ebf0550
Apply submenu override
2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878
OCD tidy up of visually misaligned filter
2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f
Convert Spree view to HAML
2018-09-11 11:22:54 +01:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
Kristina Lim
fc79aae17c
Translate authorized shops headers in account page
2018-09-08 00:34:47 +08:00
Kristina Lim
86f4a118dd
Translate placeholder for order cycle name filter
2018-09-07 17:58:34 +08:00
Kristina Lim
d06bccb832
Change i18n key for Store link in admin header
...
spree_i18n translates the "store" key in different ways, sometimes like
"shop" and sometimes like "save". This could be because of a clash in
usage between Spree add-ons.
To be more specific, the "Store" link in the admin section now uses the
"admin.header.store" translation key.
2018-09-06 22:03:39 +08:00
Pau Pérez Fabregat
0a05e6944e
Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise
...
Rename "entreprise" in i18n keys to "enterprise"
2018-09-05 13:23:02 +02:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Maikel
1b264403e0
Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user
...
Subscription emails for customer should not link to order page if customer has no user account
2018-09-03 14:38:56 +10:00
Maikel
3fadd06dc7
Merge pull request #2613 from luisramos0/cookies_better_policy_page
...
[Cookies] Updated cookies policy page text
2018-09-03 11:49:14 +10:00
VadLusk
f74a6e47d5
Remove css_splitter references, delete all_split2.css. #1361 #2633
2018-09-03 09:20:26 +10:00
Kristina Lim
f844236b9c
Remove order link in non-user order cancellation email
2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955
Remove order link in non-user failed payment email
2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a
Custom subscription placement email if non-user
...
The order link should not be provided if the order does not have an
associated user account.
2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48
Extract format for order cycle closing in emails
...
Using a helper for this, but this can be changed to look up a
translation key.
2018-09-01 23:46:08 +08:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
Maikel Linke
13b9ecab21
Fix font issue in mobile menu
2018-08-31 11:23:11 +10:00
luisramos0
e573a3fc2b
The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.
2018-08-31 11:23:11 +10:00
Maikel
1b88edea1f
Merge pull request #2420 from stveep/stripe-admin-2
...
Stripe admin 2
2018-08-30 15:48:49 +10:00
Maikel Linke
d1f7828432
Fix pending spec
...
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254
Remove old deactivated code
2018-08-30 14:50:41 +10:00
luisramos0
02b968b312
Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view
2018-08-30 00:27:35 +01:00
Kristina Lim
28792fc895
Add tests for adding/updating enterprise images
2018-08-26 03:58:19 +08:00
Matt-Yorkley
2b057a26d5
Add primary_producer to index to reduce queries
2018-08-24 15:51:37 +10:00
Maikel
871e423e12
Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name
...
Make OC name editable from the OC index
2018-08-24 11:38:31 +10:00
Maikel
4417a8f156
Merge pull request #2539 from luisramos0/delete_dead_cart
...
removed Cart route, controller, model and specs: dead code
2018-08-22 17:35:58 +10:00
stveep
17f2ba47ca
Add label for card field
2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84
Move injectors outside Stripe partial to satisfy dependencies
2018-08-19 11:50:34 +01:00
stveep
286101c934
PR changes: switch syntax for mapCC, remove ng-init
2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff
add to manifest, tidy up requirements, hide postcode similar to frontend
2018-08-19 10:43:53 +01:00
stveep
8272aebe29
Add Stripe form and duplicate Stripe Elements in backend Angular app
2018-08-19 10:43:53 +01:00
Kristina Lim
c14e7ea8d5
Allow bulk update of order cycle name
2018-08-16 21:18:24 +08:00
luisramos0
ccd5147b11
Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration
2018-08-14 10:01:48 +10:00
luisramos0
ca35c59e52
Moved the footer TOS URL from the content settings to the new section legal settings in the global settings
2018-08-14 10:01:48 +10:00
luisramos0
d920c32376
Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO
2018-08-14 10:01:48 +10:00
luisramos0
92f9cbd00a
Added new cookies banner (with link to cookie policy page and the accept cookies button)
2018-08-14 10:01:48 +10:00
luisramos0
08c5d8f3ab
Added new cookies policy page and added a link to it in the footer (cookies policy link)
2018-08-14 10:01:48 +10:00
luisramos0
0b9061df28
removed Cart route, controller, model and specs: dead code
2018-08-11 22:17:12 +01:00
luisramos0
3b1bd53d3a
Added basic integration with Matomo
...
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
2018-08-10 16:12:58 +10:00
Kristina Lim
6251c72921
Add divider between admin enterprise index actions
2018-08-10 12:17:31 +10:00
Kristina Lim
b91019ad64
Split translation key for enterprise manage button
...
The ".manage" key is still used by the column header for the "Manage"
buttons.
2018-08-10 12:12:26 +10:00
