Luis Ramos
1c628fac58
Merge branch 'master' into 3-0-stable-mar20
2020-03-20 11:28:06 +00:00
Maikel
b63c47cca2
Merge pull request #4816 from mkllnk/1860-copy-paste
...
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Luis Ramos
eccaaca907
Merge pull request #4930 from luisramos0/3-0-stable-mar6
...
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Luis Ramos
bd32510837
Merge pull request #4860 from mkllnk/3395-remove-unused-assets
...
3395 remove unused assets
2020-03-12 22:44:41 +00:00
Luis Ramos
5ce4fec68b
Add html to show the errors reported by devise 3 about password and password confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password])
2020-03-09 15:48:45 +00:00
Luis Ramos
0815068050
Merge branch 'master' into 3-0-stable-mar6
2020-03-06 09:20:03 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Luis Ramos
427d3b7641
Revert "Comment spree_paypal express in all.js temporarily"
...
This reverts commit 26ba37b117
2020-02-28 12:18:53 +01:00
Luis Ramos
bf47d34434
Merge branch 'master' into 3-0-merge-master
2020-02-28 09:52:01 +00:00
Luis Ramos
03c91dfac1
Merge pull request #4780 from luisramos0/bulk_prod_errors
...
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Maikel Linke
8432dab142
Remove unused Javascript manifest
...
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
Maikel Linke
17ea2cd510
Clean up JS assets comments
2020-02-24 11:22:47 +11:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11:00
Maikel Linke
a3e87d893a
Remove obsolete angular-sanitize
...
Our TextAngular module supplies that code.
2020-02-24 11:22:47 +11:00
Luis Ramos
26ba37b117
Comment spree_paypal express in all.js temporarily
2020-02-22 11:53:35 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
luisramos0
b3ac5d8f41
Improve code readability a little
2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63
Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
...
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +00:00
luisramos0
c773cde191
Add admin payment template for stripe sca and respective js code to make it work
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +00:00
Luis Ramos
1803ea3c38
Add traling breakline to case where errors come in a array
2020-02-20 10:06:10 +00:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
Luis Ramos
2711736004
Use Array#join and make code simpler
2020-02-18 10:49:41 +00:00
Luis Ramos
0aaa04295b
Improve and unit test errorsParser
2020-02-17 11:21:21 +00:00
Luis Ramos
7639e9a38d
Extrac ErrorsParser to separate class and make it handle the rails error structure with keys
2020-02-17 11:21:21 +00:00
Luis Ramos
9d8608f210
Merge pull request #4630 from Matt-Yorkley/product_counts
...
Show counts including all variants in order cycle exchanges
2020-02-13 11:33:58 +00:00
François Turbelin
e7b74b99ba
Refactor SortingOptions JS
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
06971b7198
Add sortable name column for Admin Products
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
luisramos0
f0f537ff8f
Fix path of spree-select2.js pointing to the file in ofn rather the file in spree_backend
2020-02-06 11:21:47 +00:00
luisramos0
8aed173127
Uncomment events in order edit page and remove unused spree autocomplete js code
2020-02-05 20:04:15 +00:00
luisramos0
61ecca7257
Move template loading to directive of customer search override
2020-02-05 20:04:15 +00:00
luisramos0
7eba657b2f
Add missing templates from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
784de340d1
Disable adaptive menu when running tests, this is what spree_backend was doing before
2020-02-05 20:04:15 +00:00
luisramos0
2885e38113
Re-activate/re-add click events that were registered in spree_backend code before
2020-02-05 16:02:43 +00:00
luisramos0
9f3ca58b55
Add empty admin/spree_backend.js
...
This file is required by spree_paypal_express that we still need after leaving spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
ffe3228848
Remove spree_backend dependencies from all.js and all.css and fix some dependencies path problems
2020-02-05 16:02:43 +00:00
luisramos0
834231eb8f
Add js code needed for the zones admin page
2020-02-05 16:02:43 +00:00
luisramos0
68f5aabd3f
Add js code needed where calculators are used: ship methods and payment methods config pages
2020-02-05 16:02:43 +00:00
luisramos0
7e7ea92833
Add js code needed in the states admin page
2020-02-05 16:02:43 +00:00
luisramos0
ebf22ceb19
Add js and css code for image settings from spree_backend
2020-02-05 16:02:43 +00:00
Matt-Yorkley
140e0b9cb1
Refactor #exchangeLoadedVariants
2020-02-05 15:11:34 +01:00
Matt-Yorkley
b3f05d1a98
Use "Variants" instead of "Products" in order cycle exchanges UI
2020-02-05 15:11:34 +01:00
Matt-Yorkley
9644b145cc
Remove num_of_products
2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0
Show counts including all variants in order cycle exchanges
2020-02-05 15:10:26 +01:00
luisramos0
ee64238bdd
Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend
...
This can be reverted when spree_backend is removed
2020-02-04 14:47:51 +00:00
luisramos0
d3130e111f
Remove on click events
...
These events can only be added to OFN when spree_backend is removed otherwise the evetns will be registered twice
2020-02-04 14:47:51 +00:00
