luisramos0
cfcf73b6a1
Make save and saving messages translatable in subscriptions items panel
2019-06-04 20:59:45 +01:00
luisramos0
eb42e81afc
Make some text entries translatable in create subscription pages: title in step 1 details and 4 review and date placeholders in step 1 details
2019-06-04 20:59:45 +01:00
luisramos0
64af81a4a2
Make search_by_email text translatable in subscriptions list page
2019-06-04 20:59:42 +01:00
Luis Ramos
fd64e53f61
Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations
...
Move shipping methods translations to lazy lookups
2019-06-04 15:15:31 +01:00
luisramos0
32c107ab5a
move translation to use relative path so that the new translation key is used
2019-05-30 23:26:23 +01:00
Masha
436a2ba0a2
went much shorted way
2019-05-30 23:08:05 +01:00
Masha
412fffba1d
the translations for Remove in the exchange forms added
2019-05-30 23:08:05 +01:00
luisramos0
5719455731
Make enterprise fees name placeholder translatable
2019-05-29 21:33:30 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Luis Ramos
9ccf502365
Merge pull request #3797 from lin-d-hop/variant-master-price
...
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
luisramos0
0dc0776705
Separate mobile menu cart code from large menu cart code
2019-05-24 15:17:41 +01:00
luisramos0
ec9d50c824
Add new cart icon and extract cart joyride from cart haml file
2019-05-24 15:16:36 +01:00
luisramos0
60c08347a5
Extract language selector from large menu haml file, add language name and clean up the code that generates the shopping@ label
2019-05-24 15:12:31 +01:00
luisramos0
15360971b0
Move signed_* files to views/shared/menu and add new logged in and profile icons
2019-05-23 15:58:02 +01:00
luisramos0
ffd883e84d
Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it
2019-05-21 12:39:29 +02:00
luisramos0
25fd6f2e78
Move empty check template from spree_frontend, it is required from the checkout page
...
This makes ofn code completely independent from spree_frontend views
2019-05-21 12:39:29 +02:00
luisramos0
a0c56f31c7
Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code
2019-05-21 12:39:29 +02:00
luisramos0
07e9043e34
Move shipping methods translations to lazy lookups
2019-05-10 11:44:49 +01:00
Luis Ramos
f844ff275b
Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757
...
added buttons to form and updated sanitizer to allow extra formatting
2019-05-10 10:48:55 +01:00
Maikel
50ca1f7173
Merge pull request #3824 from mkllnk/aus-content-updates
...
Aus content updates
2019-05-10 10:40:09 +10:00
Luis Ramos
59e7cb313d
Merge pull request #3815 from amers185/add_social_links
...
Add extra (Instagram) social media links to emails sent to customers and users [Looking for feedback/direction on completing solution]
2019-05-09 21:14:42 +01:00
Luis Ramos
6d62f4c4b4
Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information
...
1218 Remove OC "Debug Information" which appears in non-production environments
2019-05-09 16:05:18 +01:00
Luis Ramos
24c96fab8b
Merge pull request #3795 from lin-d-hop/translation-oc-spinner
...
Add translation to order cycle spinner
2019-05-09 16:03:53 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
Maikel Linke
a3adbd9fc8
Replace connect-learn banner with custom content
...
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.
Translations in custom content are an existing feature request,
"multi-lang 2.0".
2019-05-08 11:38:49 +10:00
Luis Ramos
dffa50468b
Merge pull request #3801 from Matt-Yorkley/need_for_speed
...
Fix /maps performance
2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32
Remove "Debug Information" in edit OC page
2019-05-08 01:33:58 +08:00
Syed Usama Amer
f71df770d0
added social links
2019-05-06 23:28:14 -05:00
Matt-Yorkley
6bdc5d4438
Fix maps performance
2019-05-07 00:36:08 +01:00
lin-d-hop
10fba9b39f
Add translation to order cycle spinner
...
lazy text
2019-05-05 19:12:53 +01:00
lin-d-hop
585072302c
Remove non-functional Price field from Edit Product screen
...
Update initializer to override Product Price as required field.
Revert "Update initializer to override Product Price as required field."
This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
2019-05-05 16:41:54 +01:00
Matt-Yorkley
3323ac7650
Fix duplicate error messages
2019-05-05 13:30:38 +01:00
jazzdragon
37d15a1be3
Add classes to indicate collapsible is for medium screens or smaller
2019-05-04 20:12:12 -07:00
jazzdragon
623471290e
Make sure styling doesn't get messed up if resizing down and back up
2019-05-04 19:52:08 -07:00
jazzdragon
271330d2fc
Add collapsible elements and styles
2019-05-04 19:43:46 -07:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Luis Ramos
3b2e614c57
Merge pull request #3734 from luisramos0/2-0-validate-distribution
...
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
Maikel
736ac49581
Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues
...
[Spree Upgrade] Fix two issues in admin orders edit page
2019-04-19 07:33:26 +10:00
Luis Ramos
67a7e26757
Merge pull request #3695 from luisramos0/2-0-emails-transl
...
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
2019-04-16 13:44:24 +01:00
luisramos0
fce3d69345
Add flash and warning to the cart page when item becomes unavailable
2019-04-13 21:39:41 +01:00
Luis Ramos
ddd3443a86
Merge pull request #3659 from mkllnk/missing-translation
...
Fix "What's this?" on admin dashboard
2019-04-10 22:05:19 +01:00
Luis Ramos
97c920f1b0
Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments
...
3477 Render only eligible adjustments on the order page
2019-04-10 21:44:16 +01:00
Luis Ramos
4478d51aee
Merge pull request #3668 from luisramos0/2-0-stable-Mar29
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
luisramos0
5989a654d1
Remove stock location from stock levels table and fix Spree.t entry bug
2019-04-05 14:01:27 +01:00
luisramos0
6e49cf9f87
Bring cancel email from spree so it gets the normal ofn style
2019-04-04 12:31:12 +01:00
Maikel Linke
7035d57267
Better helper naming and spec cover
2019-04-03 11:13:56 +11:00
Maikel Linke
0c846758dd
Add missing translation to order form
...
I saw the following error:
translation missing: en.spree.line_item_adjustments
In this commit I change all three translations in the view file to use
lazy lookup.
2019-04-02 17:47:36 +11:00
Maikel Linke
2a6236823f
Move adjustment filtering from view to helper
2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6
Move adjustment selection to helper
2019-04-02 17:02:05 +11:00
