Pau Pérez Fabregat
1ab50798fe
Merge pull request #3189 from luisramos0/3043-i18n-emails
...
Make all mailers use appropriate locale when sending emails
2018-12-24 14:59:04 +01:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
Maikel
84f2f9af3c
Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
...
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
luisramos0
5e960512ac
Set user locale on user registrations #create
...
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
2018-12-18 15:30:01 +00:00
luisramos0
a9222665b8
Refactor user registrations controller, early return to reduce indentation
2018-12-18 15:26:49 +00:00
Pau Pérez Fabregat
1876ec42dc
Merge pull request #3201 from kevinchristianson/add-missing-stars
...
Add missing 'required field' stars in new product form
2018-12-17 10:36:51 +01:00
Pau Pérez Fabregat
554d650b8c
Merge pull request #3176 from kevinchristianson/button-translation-fix
...
Fix untranslated buttons at image step of registration modal
2018-12-17 10:36:07 +01:00
Pau Pérez Fabregat
2deffb9c9f
Merge pull request #3076 from Matt-Yorkley/orders_checkboxes
...
Fix checkbox values on orders page
2018-12-17 10:35:46 +01:00
Pau Pérez Fabregat
fe0c56c800
Merge pull request #3174 from kevinchristianson/footer-url-fix
...
Fix broken registration link in footer
2018-12-14 15:42:08 +01:00
Pau Pérez Fabregat
64e41712c6
Merge pull request #3130 from coopdevs/extract-restart-checkout
...
Extract restart checkout
2018-12-12 17:12:53 +01:00
luisramos0
e274442d77
Cover i18nhelper.valid_locale and user mailer with tests related to localized emails
2018-12-11 11:16:50 +00:00
haseleyi
835617159e
Add missing 'required field' stars in new product form
2018-12-10 18:02:39 -08:00
Matt-Yorkley
0c5ac99e0f
Fix multiple results with 'inventory_items_shipment_id_null' ransack query
...
The q['inventory_items_shipment_id_null'] search element was generating duplicates where there were multiple line items on an order that were ready to be shipped, with id = null
2018-12-10 20:48:53 +00:00
Matt-Yorkley
d48774e3a2
Add comment
2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974
Fix checkbox values on orders page
2018-12-10 20:48:53 +00:00
Kristina Lim
df51d137dc
Update some code style for product import
2018-12-10 03:30:52 +08:00
Kristina Lim
cec50e81f5
Make product import set correct VO stock settings
2018-12-10 03:30:46 +08:00
Kristina Lim
0de829017a
Refactor finding or initializing VO for product import
2018-12-10 03:30:39 +08:00
Kristina Lim
c873a7b8e3
Move stock settings override validation to concern
2018-12-09 23:29:36 +08:00
Kristina Lim
34313c94ca
Make reset stock settings for VO force limited stock
2018-12-09 21:47:05 +08:00
Kristina Lim
83b6973bc2
Require compatible VO on_demand and count_on_hand
2018-12-07 14:39:36 +08:00
haseleyi
3f6e96dd5d
Fix comment
2018-12-06 14:07:45 -08:00
haseleyi
4a0744dd94
Add comment to explain hard-coded link
2018-12-06 11:49:39 -08:00
luisramos0
b9b91231ae
Fix rubocop issues in mailers
2018-12-06 14:18:24 +00:00
luisramos0
0f442a911e
Improve I18nHelper.valid_locale to handle empty objects
2018-12-06 12:48:48 +00:00
luisramos0
feea499298
Make all mailers use appropriate locale when sending emails
2018-12-06 11:45:44 +00:00
Kristina Lim
71db9f5289
Import CSS variables in admin/components/input
2018-12-06 14:08:06 +08:00
haseleyi
75277e92e4
Lazy-load the translations for images step of registration
2018-12-05 11:36:27 -08:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
47d51ca525
Prefer guard clause in updateCountOnHand for VOs
2018-12-05 17:40:31 +08:00
Kristina Lim
34c34b94d1
Describe method countOnHandPlaceholder for VOs
2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
f5dc03e118
Style disabled text fields in admin pages
2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7
Make VO count on hand readonly unless limited stock
2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5
Ensure in UI compatible VO count and on demand
2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c
Translate variant override on_demand yes and no
2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Pau Pérez Fabregat
3b56212290
Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1
...
Remove frontoffice enterprises n+1
2018-12-05 08:12:19 +01:00
Pau Pérez Fabregat
e5a267f4c2
Merge pull request #2735 from luisramos0/cookies_colors
...
Moved definition of colors in the cookies modal and banner colors to common darkswarm/base/colors
2018-12-05 08:06:58 +01:00
haseleyi
94d12217de
Fix untranslated buttons at image step of registration modal
2018-12-04 21:30:42 -08:00
haseleyi
e863c3dec8
Fix broken link in register call partial
2018-12-04 10:23:46 -08:00
Hugo Daniel
24dab58de7
Lazy load translations and add keys
2018-11-30 10:49:36 +01:00
luisramos0
1c5d94472f
Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines
2018-11-29 18:39:58 +00:00
Pau Pérez Fabregat
08297863be
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
...
Expand all steps in the checkout page by default
2018-11-29 16:28:42 +01:00
Pau Pérez Fabregat
9f17acd63c
Merge pull request #3136 from kevinchristianson/dashboard-translation
...
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-29 16:27:05 +01:00
Hugo Daniel
aa948552e1
Import payment_methods edit view and apply overrides
2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6
Import payment_methods form partial and apply overrides
2018-11-29 14:58:06 +01:00
Hugo Daniel
29bc4c52a5
Import payment_methods#new view and apply overrides
2018-11-29 14:56:28 +01:00
