spree_frontend 4.1.8 → 4.2.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (375) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/arrow-down.svg +12 -0
  3. data/app/assets/images/edit.svg +1 -1
  4. data/app/assets/images/flags/4x3/ad.svg +150 -0
  5. data/app/assets/images/flags/4x3/ae.svg +6 -0
  6. data/app/assets/images/flags/4x3/af.svg +81 -0
  7. data/app/assets/images/flags/4x3/ag.svg +14 -0
  8. data/app/assets/images/flags/4x3/ai.svg +763 -0
  9. data/app/assets/images/flags/4x3/al.svg +5 -0
  10. data/app/assets/images/flags/4x3/am.svg +5 -0
  11. data/app/assets/images/flags/4x3/ao.svg +13 -0
  12. data/app/assets/images/flags/4x3/aq.svg +5 -0
  13. data/app/assets/images/flags/4x3/ar.svg +31 -0
  14. data/app/assets/images/flags/4x3/as.svg +33 -0
  15. data/app/assets/images/flags/4x3/at.svg +6 -0
  16. data/app/assets/images/flags/4x3/au.svg +9 -0
  17. data/app/assets/images/flags/4x3/aw.svg +186 -0
  18. data/app/assets/images/flags/4x3/ax.svg +18 -0
  19. data/app/assets/images/flags/4x3/az.svg +8 -0
  20. data/app/assets/images/flags/4x3/ba.svg +12 -0
  21. data/app/assets/images/flags/4x3/bb.svg +6 -0
  22. data/app/assets/images/flags/4x3/bd.svg +4 -0
  23. data/app/assets/images/flags/4x3/be.svg +7 -0
  24. data/app/assets/images/flags/4x3/bf.svg +7 -0
  25. data/app/assets/images/flags/4x3/bg.svg +7 -0
  26. data/app/assets/images/flags/4x3/bh.svg +9 -0
  27. data/app/assets/images/flags/4x3/bi.svg +15 -0
  28. data/app/assets/images/flags/4x3/bj.svg +14 -0
  29. data/app/assets/images/flags/4x3/bl.svg +7 -0
  30. data/app/assets/images/flags/4x3/bm.svg +98 -0
  31. data/app/assets/images/flags/4x3/bn.svg +36 -0
  32. data/app/assets/images/flags/4x3/bo.svg +676 -0
  33. data/app/assets/images/flags/4x3/bq.svg +5 -0
  34. data/app/assets/images/flags/4x3/br.svg +45 -0
  35. data/app/assets/images/flags/4x3/bs.svg +13 -0
  36. data/app/assets/images/flags/4x3/bt.svg +89 -0
  37. data/app/assets/images/flags/4x3/bv.svg +13 -0
  38. data/app/assets/images/flags/4x3/bw.svg +7 -0
  39. data/app/assets/images/flags/4x3/by.svg +20 -0
  40. data/app/assets/images/flags/4x3/bz.svg +145 -0
  41. data/app/assets/images/flags/4x3/ca.svg +4 -0
  42. data/app/assets/images/flags/4x3/cc.svg +19 -0
  43. data/app/assets/images/flags/4x3/cd.svg +5 -0
  44. data/app/assets/images/flags/4x3/cf.svg +15 -0
  45. data/app/assets/images/flags/4x3/cg.svg +12 -0
  46. data/app/assets/images/flags/4x3/ch.svg +9 -0
  47. data/app/assets/images/flags/4x3/ci.svg +7 -0
  48. data/app/assets/images/flags/4x3/ck.svg +9 -0
  49. data/app/assets/images/flags/4x3/cl.svg +13 -0
  50. data/app/assets/images/flags/4x3/cm.svg +15 -0
  51. data/app/assets/images/flags/4x3/cn.svg +11 -0
  52. data/app/assets/images/flags/4x3/co.svg +7 -0
  53. data/app/assets/images/flags/4x3/cr.svg +7 -0
  54. data/app/assets/images/flags/4x3/cu.svg +13 -0
  55. data/app/assets/images/flags/4x3/cv.svg +13 -0
  56. data/app/assets/images/flags/4x3/cw.svg +14 -0
  57. data/app/assets/images/flags/4x3/cx.svg +15 -0
  58. data/app/assets/images/flags/4x3/cy.svg +6 -0
  59. data/app/assets/images/flags/4x3/cz.svg +5 -0
  60. data/app/assets/images/flags/4x3/de.svg +5 -0
  61. data/app/assets/images/flags/4x3/dj.svg +13 -0
  62. data/app/assets/images/flags/4x3/dk.svg +5 -0
  63. data/app/assets/images/flags/4x3/dm.svg +152 -0
  64. data/app/assets/images/flags/4x3/do.svg +6745 -0
  65. data/app/assets/images/flags/4x3/dz.svg +5 -0
  66. data/app/assets/images/flags/4x3/ec.svg +138 -0
  67. data/app/assets/images/flags/4x3/ee.svg +7 -0
  68. data/app/assets/images/flags/4x3/eg.svg +38 -0
  69. data/app/assets/images/flags/4x3/eh.svg +15 -0
  70. data/app/assets/images/flags/4x3/er.svg +8 -0
  71. data/app/assets/images/flags/4x3/es-ca.svg +4 -0
  72. data/app/assets/images/flags/4x3/es.svg +544 -0
  73. data/app/assets/images/flags/4x3/et.svg +14 -0
  74. data/app/assets/images/flags/4x3/eu.svg +28 -0
  75. data/app/assets/images/flags/4x3/fi.svg +5 -0
  76. data/app/assets/images/flags/4x3/fj.svg +122 -0
  77. data/app/assets/images/flags/4x3/fk.svg +90 -0
  78. data/app/assets/images/flags/4x3/fm.svg +11 -0
  79. data/app/assets/images/flags/4x3/fo.svg +12 -0
  80. data/app/assets/images/flags/4x3/fr.svg +7 -0
  81. data/app/assets/images/flags/4x3/ga.svg +7 -0
  82. data/app/assets/images/flags/4x3/gb-eng.svg +5 -0
  83. data/app/assets/images/flags/4x3/gb-nir.svg +132 -0
  84. data/app/assets/images/flags/4x3/gb-sct.svg +4 -0
  85. data/app/assets/images/flags/4x3/gb-wls.svg +9 -0
  86. data/app/assets/images/flags/4x3/gb.svg +7 -0
  87. data/app/assets/images/flags/4x3/gd.svg +27 -0
  88. data/app/assets/images/flags/4x3/ge.svg +6 -0
  89. data/app/assets/images/flags/4x3/gf.svg +7 -0
  90. data/app/assets/images/flags/4x3/gg.svg +9 -0
  91. data/app/assets/images/flags/4x3/gh.svg +6 -0
  92. data/app/assets/images/flags/4x3/gi.svg +32 -0
  93. data/app/assets/images/flags/4x3/gl.svg +4 -0
  94. data/app/assets/images/flags/4x3/gm.svg +14 -0
  95. data/app/assets/images/flags/4x3/gn.svg +7 -0
  96. data/app/assets/images/flags/4x3/gp.svg +7 -0
  97. data/app/assets/images/flags/4x3/gq.svg +23 -0
  98. data/app/assets/images/flags/4x3/gr.svg +16 -0
  99. data/app/assets/images/flags/4x3/gs.svg +201 -0
  100. data/app/assets/images/flags/4x3/gt.svg +204 -0
  101. data/app/assets/images/flags/4x3/gu.svg +39 -0
  102. data/app/assets/images/flags/4x3/gw.svg +13 -0
  103. data/app/assets/images/flags/4x3/gy.svg +9 -0
  104. data/app/assets/images/flags/4x3/hk.svg +30 -0
  105. data/app/assets/images/flags/4x3/hm.svg +9 -0
  106. data/app/assets/images/flags/4x3/hn.svg +18 -0
  107. data/app/assets/images/flags/4x3/hr.svg +58 -0
  108. data/app/assets/images/flags/4x3/ht.svg +116 -0
  109. data/app/assets/images/flags/4x3/hu.svg +7 -0
  110. data/app/assets/images/flags/4x3/id.svg +6 -0
  111. data/app/assets/images/flags/4x3/ie.svg +7 -0
  112. data/app/assets/images/flags/4x3/il.svg +14 -0
  113. data/app/assets/images/flags/4x3/im.svg +36 -0
  114. data/app/assets/images/flags/4x3/in.svg +25 -0
  115. data/app/assets/images/flags/4x3/io.svg +138 -0
  116. data/app/assets/images/flags/4x3/iq.svg +10 -0
  117. data/app/assets/images/flags/4x3/ir.svg +219 -0
  118. data/app/assets/images/flags/4x3/is.svg +12 -0
  119. data/app/assets/images/flags/4x3/it.svg +7 -0
  120. data/app/assets/images/flags/4x3/je.svg +29 -0
  121. data/app/assets/images/flags/4x3/jm.svg +8 -0
  122. data/app/assets/images/flags/4x3/jo.svg +16 -0
  123. data/app/assets/images/flags/4x3/jp.svg +11 -0
  124. data/app/assets/images/flags/4x3/ke.svg +23 -0
  125. data/app/assets/images/flags/4x3/kg.svg +15 -0
  126. data/app/assets/images/flags/4x3/kh.svg +61 -0
  127. data/app/assets/images/flags/4x3/ki.svg +36 -0
  128. data/app/assets/images/flags/4x3/km.svg +16 -0
  129. data/app/assets/images/flags/4x3/kn.svg +14 -0
  130. data/app/assets/images/flags/4x3/kp.svg +15 -0
  131. data/app/assets/images/flags/4x3/kr.svg +24 -0
  132. data/app/assets/images/flags/4x3/kw.svg +13 -0
  133. data/app/assets/images/flags/4x3/ky.svg +63 -0
  134. data/app/assets/images/flags/4x3/kz.svg +23 -0
  135. data/app/assets/images/flags/4x3/la.svg +12 -0
  136. data/app/assets/images/flags/4x3/lb.svg +15 -0
  137. data/app/assets/images/flags/4x3/lc.svg +8 -0
  138. data/app/assets/images/flags/4x3/li.svg +43 -0
  139. data/app/assets/images/flags/4x3/lk.svg +22 -0
  140. data/app/assets/images/flags/4x3/lr.svg +14 -0
  141. data/app/assets/images/flags/4x3/ls.svg +8 -0
  142. data/app/assets/images/flags/4x3/lt.svg +7 -0
  143. data/app/assets/images/flags/4x3/lu.svg +5 -0
  144. data/app/assets/images/flags/4x3/lv.svg +6 -0
  145. data/app/assets/images/flags/4x3/ly.svg +13 -0
  146. data/app/assets/images/flags/4x3/ma.svg +4 -0
  147. data/app/assets/images/flags/4x3/mc.svg +6 -0
  148. data/app/assets/images/flags/4x3/md.svg +70 -0
  149. data/app/assets/images/flags/4x3/me.svg +116 -0
  150. data/app/assets/images/flags/4x3/mf.svg +7 -0
  151. data/app/assets/images/flags/4x3/mg.svg +7 -0
  152. data/app/assets/images/flags/4x3/mh.svg +7 -0
  153. data/app/assets/images/flags/4x3/mk.svg +5 -0
  154. data/app/assets/images/flags/4x3/ml.svg +7 -0
  155. data/app/assets/images/flags/4x3/mm.svg +16 -0
  156. data/app/assets/images/flags/4x3/mn.svg +13 -0
  157. data/app/assets/images/flags/4x3/mo.svg +9 -0
  158. data/app/assets/images/flags/4x3/mp.svg +86 -0
  159. data/app/assets/images/flags/4x3/mq.svg +7 -0
  160. data/app/assets/images/flags/4x3/mr.svg +6 -0
  161. data/app/assets/images/flags/4x3/ms.svg +78 -0
  162. data/app/assets/images/flags/4x3/mt.svg +49 -0
  163. data/app/assets/images/flags/4x3/mu.svg +8 -0
  164. data/app/assets/images/flags/4x3/mv.svg +6 -0
  165. data/app/assets/images/flags/4x3/mw.svg +10 -0
  166. data/app/assets/images/flags/4x3/mx.svg +382 -0
  167. data/app/assets/images/flags/4x3/my.svg +15 -0
  168. data/app/assets/images/flags/4x3/mz.svg +21 -0
  169. data/app/assets/images/flags/4x3/na.svg +16 -0
  170. data/app/assets/images/flags/4x3/nc.svg +14 -0
  171. data/app/assets/images/flags/4x3/ne.svg +6 -0
  172. data/app/assets/images/flags/4x3/nf.svg +9 -0
  173. data/app/assets/images/flags/4x3/ng.svg +6 -0
  174. data/app/assets/images/flags/4x3/ni.svg +129 -0
  175. data/app/assets/images/flags/4x3/nl.svg +5 -0
  176. data/app/assets/images/flags/4x3/no.svg +7 -0
  177. data/app/assets/images/flags/4x3/np.svg +14 -0
  178. data/app/assets/images/flags/4x3/nr.svg +12 -0
  179. data/app/assets/images/flags/4x3/nu.svg +26 -0
  180. data/app/assets/images/flags/4x3/nz.svg +41 -0
  181. data/app/assets/images/flags/4x3/om.svg +115 -0
  182. data/app/assets/images/flags/4x3/pa.svg +14 -0
  183. data/app/assets/images/flags/4x3/pe.svg +244 -0
  184. data/app/assets/images/flags/4x3/pf.svg +19 -0
  185. data/app/assets/images/flags/4x3/pg.svg +9 -0
  186. data/app/assets/images/flags/4x3/ph.svg +9 -0
  187. data/app/assets/images/flags/4x3/pk.svg +15 -0
  188. data/app/assets/images/flags/4x3/pl.svg +6 -0
  189. data/app/assets/images/flags/4x3/pm.svg +7 -0
  190. data/app/assets/images/flags/4x3/pn.svg +62 -0
  191. data/app/assets/images/flags/4x3/pr.svg +13 -0
  192. data/app/assets/images/flags/4x3/ps.svg +15 -0
  193. data/app/assets/images/flags/4x3/pt.svg +57 -0
  194. data/app/assets/images/flags/4x3/pw.svg +11 -0
  195. data/app/assets/images/flags/4x3/py.svg +157 -0
  196. data/app/assets/images/flags/4x3/qa.svg +4 -0
  197. data/app/assets/images/flags/4x3/re.svg +7 -0
  198. data/app/assets/images/flags/4x3/ro.svg +7 -0
  199. data/app/assets/images/flags/4x3/rs.svg +292 -0
  200. data/app/assets/images/flags/4x3/ru.svg +7 -0
  201. data/app/assets/images/flags/4x3/rw.svg +13 -0
  202. data/app/assets/images/flags/4x3/sa.svg +26 -0
  203. data/app/assets/images/flags/4x3/sb.svg +13 -0
  204. data/app/assets/images/flags/4x3/sc.svg +14 -0
  205. data/app/assets/images/flags/4x3/sd.svg +13 -0
  206. data/app/assets/images/flags/4x3/se.svg +5 -0
  207. data/app/assets/images/flags/4x3/sg.svg +13 -0
  208. data/app/assets/images/flags/4x3/sh.svg +74 -0
  209. data/app/assets/images/flags/4x3/si.svg +18 -0
  210. data/app/assets/images/flags/4x3/sj.svg +7 -0
  211. data/app/assets/images/flags/4x3/sk.svg +9 -0
  212. data/app/assets/images/flags/4x3/sl.svg +7 -0
  213. data/app/assets/images/flags/4x3/sm.svg +91 -0
  214. data/app/assets/images/flags/4x3/sn.svg +8 -0
  215. data/app/assets/images/flags/4x3/so.svg +11 -0
  216. data/app/assets/images/flags/4x3/sr.svg +6 -0
  217. data/app/assets/images/flags/4x3/ss.svg +8 -0
  218. data/app/assets/images/flags/4x3/st.svg +16 -0
  219. data/app/assets/images/flags/4x3/sv.svg +594 -0
  220. data/app/assets/images/flags/4x3/sx.svg +56 -0
  221. data/app/assets/images/flags/4x3/sy.svg +6 -0
  222. data/app/assets/images/flags/4x3/sz.svg +45 -0
  223. data/app/assets/images/flags/4x3/tc.svg +67 -0
  224. data/app/assets/images/flags/4x3/td.svg +7 -0
  225. data/app/assets/images/flags/4x3/tf.svg +15 -0
  226. data/app/assets/images/flags/4x3/tg.svg +14 -0
  227. data/app/assets/images/flags/4x3/th.svg +7 -0
  228. data/app/assets/images/flags/4x3/tj.svg +22 -0
  229. data/app/assets/images/flags/4x3/tk.svg +5 -0
  230. data/app/assets/images/flags/4x3/tl.svg +13 -0
  231. data/app/assets/images/flags/4x3/tm.svg +206 -0
  232. data/app/assets/images/flags/4x3/tn.svg +13 -0
  233. data/app/assets/images/flags/4x3/to.svg +10 -0
  234. data/app/assets/images/flags/4x3/tr.svg +8 -0
  235. data/app/assets/images/flags/4x3/tt.svg +5 -0
  236. data/app/assets/images/flags/4x3/tv.svg +16 -0
  237. data/app/assets/images/flags/4x3/tw.svg +14 -0
  238. data/app/assets/images/flags/4x3/tz.svg +13 -0
  239. data/app/assets/images/flags/4x3/ua.svg +6 -0
  240. data/app/assets/images/flags/4x3/ug.svg +30 -0
  241. data/app/assets/images/flags/4x3/um.svg +15 -0
  242. data/app/assets/images/flags/4x3/un.svg +16 -0
  243. data/app/assets/images/flags/4x3/us.svg +10 -0
  244. data/app/assets/images/flags/4x3/uy.svg +28 -0
  245. data/app/assets/images/flags/4x3/uz.svg +30 -0
  246. data/app/assets/images/flags/4x3/va.svg +479 -0
  247. data/app/assets/images/flags/4x3/vc.svg +8 -0
  248. data/app/assets/images/flags/4x3/ve.svg +26 -0
  249. data/app/assets/images/flags/4x3/vg.svg +127 -0
  250. data/app/assets/images/flags/4x3/vi.svg +28 -0
  251. data/app/assets/images/flags/4x3/vn.svg +11 -0
  252. data/app/assets/images/flags/4x3/vu.svg +18 -0
  253. data/app/assets/images/flags/4x3/wf.svg +7 -0
  254. data/app/assets/images/flags/4x3/ws.svg +7 -0
  255. data/app/assets/images/flags/4x3/xk.svg +16 -0
  256. data/app/assets/images/flags/4x3/ye.svg +7 -0
  257. data/app/assets/images/flags/4x3/yt.svg +7 -0
  258. data/app/assets/images/flags/4x3/za.svg +17 -0
  259. data/app/assets/images/flags/4x3/zm.svg +27 -0
  260. data/app/assets/images/flags/4x3/zw.svg +21 -0
  261. data/app/assets/images/global.svg +1 -0
  262. data/app/assets/images/info.svg +7 -0
  263. data/app/assets/images/pagination-arrow-right.svg +3 -10
  264. data/app/assets/images/pagination-double-arrow-right.svg +6 -13
  265. data/app/assets/images/plus.svg +1 -1
  266. data/app/assets/images/search.svg +1 -1
  267. data/app/assets/javascripts/spree/frontend.js +3 -0
  268. data/app/assets/javascripts/spree/frontend/checkout.js +1 -1
  269. data/app/assets/javascripts/spree/frontend/checkout/address.js +19 -10
  270. data/app/assets/javascripts/spree/frontend/checkout/payment.js +50 -23
  271. data/app/assets/javascripts/spree/frontend/login.js +5 -0
  272. data/app/assets/javascripts/spree/frontend/main_nav_bar.js +86 -0
  273. data/app/assets/javascripts/spree/frontend/multi_currency.js +13 -0
  274. data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js +53 -10
  275. data/app/assets/javascripts/spree/frontend/views/spree/products/index.js +84 -14
  276. data/app/assets/javascripts/spree/frontend/views/spree/shared/product_added_modal.js +7 -0
  277. data/app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js +93 -0
  278. data/app/assets/stylesheets/spree/frontend.css +0 -1
  279. data/app/assets/stylesheets/spree/frontend/application.scss +4 -0
  280. data/app/assets/stylesheets/spree/frontend/components-bootstrap/carousel.scss +4 -0
  281. data/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss +80 -1
  282. data/app/assets/stylesheets/spree/frontend/flags/_flag-icon-base.scss +23 -0
  283. data/app/assets/stylesheets/spree/frontend/flags/_flag-icon-list.scss +265 -0
  284. data/app/assets/stylesheets/spree/frontend/flags/_variables.scss +2 -0
  285. data/app/assets/stylesheets/spree/frontend/flags/flag-icon.scss +3 -0
  286. data/app/assets/stylesheets/spree/frontend/helpers/spree/frontend_helper.scss +7 -0
  287. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss +0 -4
  288. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/delivery.scss +6 -0
  289. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss +3 -4
  290. data/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss +2 -2
  291. data/app/assets/stylesheets/spree/frontend/views/spree/products/cart_form.scss +8 -0
  292. data/app/assets/stylesheets/spree/frontend/views/spree/products/gallery_modal.scss +1 -0
  293. data/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss +28 -4
  294. data/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss +7 -0
  295. data/app/assets/stylesheets/spree/frontend/views/spree/shared/_color_select.scss +10 -9
  296. data/app/assets/stylesheets/spree/frontend/views/spree/shared/carousel/single.scss +1 -1
  297. data/app/assets/stylesheets/spree/frontend/views/spree/shared/carousel/thumbnails.scss +1 -0
  298. data/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss +9 -4
  299. data/app/assets/stylesheets/spree/frontend/views/spree/shared/change_store.scss +7 -0
  300. data/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss +30 -25
  301. data/app/assets/stylesheets/spree/frontend/views/spree/shared/mobile_navigation.scss +29 -3
  302. data/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss +24 -7
  303. data/app/assets/stylesheets/spree/frontend/views/spree/shared/quantity_select.scss +9 -12
  304. data/app/assets/stylesheets/spree/frontend/views/spree/shared/search_form.scss +12 -0
  305. data/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss +0 -6
  306. data/app/controllers/spree/currency_controller.rb +17 -0
  307. data/app/controllers/spree/products_controller.rb +29 -13
  308. data/app/controllers/spree/store_controller.rb +4 -0
  309. data/app/helpers/spree/addresses_helper.rb +37 -7
  310. data/app/helpers/spree/frontend_helper.rb +33 -3
  311. data/app/helpers/spree/navigation_helper.rb +4 -1
  312. data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb +1 -1
  313. data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb +1 -1
  314. data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb +1 -1
  315. data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb +1 -1
  316. data/app/views/spree/address/_form.html.erb +22 -22
  317. data/app/views/spree/addresses/_form.html.erb +15 -6
  318. data/app/views/spree/addresses/edit.html.erb +13 -8
  319. data/app/views/spree/addresses/new.html.erb +5 -1
  320. data/app/views/spree/checkout/_address.html.erb +16 -18
  321. data/app/views/spree/checkout/_confirm.html.erb +5 -47
  322. data/app/views/spree/checkout/_delivery.html.erb +10 -3
  323. data/app/views/spree/checkout/_delivery_informations.html.erb +44 -0
  324. data/app/views/spree/checkout/_payment.html.erb +5 -24
  325. data/app/views/spree/checkout/_payment_sources.html.erb +17 -0
  326. data/app/views/spree/checkout/_summary.html.erb +22 -17
  327. data/app/views/spree/checkout/edit.html.erb +1 -1
  328. data/app/views/spree/checkout/payment/_gateway.html.erb +1 -1
  329. data/app/views/spree/checkout/registration.html.erb +2 -2
  330. data/app/views/spree/errors/not_found.html.erb +2 -2
  331. data/app/views/spree/home/index.html.erb +29 -35
  332. data/app/views/spree/layouts/checkout.html.erb +3 -1
  333. data/app/views/spree/orders/_coupon_code.html.erb +1 -1
  334. data/app/views/spree/orders/_line_item.html.erb +1 -1
  335. data/app/views/spree/orders/_line_item_data.html.erb +2 -2
  336. data/app/views/spree/orders/show.html.erb +1 -1
  337. data/app/views/spree/products/_cart_form.html.erb +8 -2
  338. data/app/views/spree/products/_color_option_type.html.erb +15 -14
  339. data/app/views/spree/products/_description.html.erb +10 -2
  340. data/app/views/spree/products/_filters_desktop.html.erb +43 -41
  341. data/app/views/spree/products/_filters_mobile.html.erb +6 -6
  342. data/app/views/spree/products/_gallery_modal.html.erb +1 -1
  343. data/app/views/spree/products/_option_type.html.erb +0 -1
  344. data/app/views/spree/products/_properties.html.erb +6 -4
  345. data/app/views/spree/products/_sort_desktop.html.erb +6 -6
  346. data/app/views/spree/products/_sort_mobile.html.erb +8 -8
  347. data/app/views/spree/products/_vendor_info.html.erb +13 -0
  348. data/app/views/spree/products/show.html.erb +3 -0
  349. data/app/views/spree/shared/_breadcrumbs.html.erb +2 -2
  350. data/app/views/spree/shared/_carousel_4_products.html.erb +1 -1
  351. data/app/views/spree/shared/_cart.html.erb +1 -1
  352. data/app/views/spree/shared/_change_store.html.erb +25 -0
  353. data/app/views/spree/shared/_checkout_header.html.erb +2 -2
  354. data/app/views/spree/shared/_footer.html.erb +12 -8
  355. data/app/views/spree/shared/_head.html.erb +2 -1
  356. data/app/views/spree/shared/_link_to_account.html.erb +1 -0
  357. data/app/views/spree/shared/_link_to_cart.html.erb +1 -2
  358. data/app/views/spree/shared/_login.html.erb +4 -4
  359. data/app/views/spree/shared/_main_nav_bar.html.erb +46 -40
  360. data/app/views/spree/shared/_mobile_change_store.html.erb +30 -0
  361. data/app/views/spree/shared/_mobile_navigation.html.erb +29 -52
  362. data/app/views/spree/shared/_nav_bar.html.erb +6 -16
  363. data/app/views/spree/shared/_option_values.html.erb +2 -2
  364. data/app/views/spree/shared/_quantity_select.html.erb +1 -1
  365. data/app/views/spree/shared/_search.html.erb +8 -11
  366. data/app/views/spree/shared/_taxonomies.html.erb +1 -1
  367. data/app/views/spree/shared/carousel/_thumbnails.html.erb +32 -30
  368. data/app/views/spree/users/_address.html.erb +16 -24
  369. data/app/views/spree/users/_address_controls.html.erb +11 -0
  370. data/app/views/spree/users/show.html.erb +14 -12
  371. data/config/routes.rb +2 -0
  372. data/spree_frontend.gemspec +4 -4
  373. metadata +300 -17
  374. data/app/assets/stylesheets/spree/frontend/_glyphicons_urls_fix.scss +0 -10
  375. data/app/assets/stylesheets/spree/frontend/address_book.scss +0 -8
@@ -20,48 +20,42 @@
20
20
  <div class="row">
21
21
  <div class="col-6">
22
22
 
23
- <div class="homepage-taxon-box mb-3">
24
- <%= link_to spree.nested_taxons_path('men') do %>
25
- <img class="w-100 lazyload"
26
- data-src="<%= asset_path('homepage/category_banner_upper.jpg') %>"
27
- data-srcset="<%= image_source_set('homepage/category_banner_upper') %>"
28
- alt="<%= Spree.t('homepage.men')%>" />
29
-
30
- <div class="homepage-taxon-box-text">
31
- <h3><%= Spree.t('homepage.men') %></h3>
32
- </div>
33
- <% end %>
34
- </div>
23
+ <%= link_to spree.nested_taxons_path('men'), class: "homepage-taxon-box mb-3" do %>
24
+ <img class="w-100 lazyload"
25
+ data-src="<%= asset_path('homepage/category_banner_upper.jpg') %>"
26
+ data-srcset="<%= image_source_set('homepage/category_banner_upper') %>"
27
+ alt="<%= Spree.t('homepage.men')%>" />
28
+
29
+ <div class="homepage-taxon-box-text">
30
+ <h3><%= Spree.t('homepage.men') %></h3>
31
+ </div>
32
+ <% end %>
35
33
 
36
- <div class="homepage-taxon-box">
37
- <%= link_to spree.nested_taxons_path('sportswear') do %>
38
- <img class="w-100 lazyload"
39
- data-src="<%= asset_path('homepage/category_banner_lower.jpg') %>"
40
- data-srcset="<%= image_source_set('homepage/category_banner_lower') %>"
41
- alt="<%= Spree.t('homepage.sportswear')%>" />
34
+ <%= link_to spree.nested_taxons_path('sportswear'), class: "homepage-taxon-box" do %>
35
+ <img class="w-100 lazyload"
36
+ data-src="<%= asset_path('homepage/category_banner_lower.jpg') %>"
37
+ data-srcset="<%= image_source_set('homepage/category_banner_lower') %>"
38
+ alt="<%= Spree.t('homepage.sportswear')%>" />
42
39
 
43
- <div class="homepage-taxon-box-text" role="img" aria-label="<%= Spree.t('homepage.sportswear') %>">
44
- <h3><%= Spree.t('homepage.sportswear') %></h3>
45
- </div>
46
- <% end %>
47
- </div>
40
+ <div class="homepage-taxon-box-text" role="img" aria-label="<%= Spree.t('homepage.sportswear') %>">
41
+ <h3><%= Spree.t('homepage.sportswear') %></h3>
42
+ </div>
43
+ <% end %>
48
44
 
49
45
  </div>
50
46
 
51
47
  <div class="col-6 d-flex flex-column">
52
48
 
53
- <div class="homepage-taxon-box flex-grow-1">
54
- <%= link_to spree.nested_taxons_path('women') do %>
55
- <img class="w-100 lazyload"
56
- data-src="<%= asset_path('homepage/big_category_banner.jpg') %>"
57
- data-srcset="<%= image_source_set('homepage/big_category_banner') %>"
58
- alt="<%= Spree.t('homepage.women')%>" />
49
+ <%= link_to spree.nested_taxons_path('women'), class: "homepage-taxon-box flex-grow-1" do %>
50
+ <img class="w-100 lazyload"
51
+ data-src="<%= asset_path('homepage/big_category_banner.jpg') %>"
52
+ data-srcset="<%= image_source_set('homepage/big_category_banner') %>"
53
+ alt="<%= Spree.t('homepage.women')%>" />
59
54
 
60
- <div class="homepage-taxon-box-text">
61
- <h3><%= Spree.t('homepage.women') %></h3>
62
- </div>
63
- <% end %>
64
- </div>
55
+ <div class="homepage-taxon-box-text">
56
+ <h3><%= Spree.t('homepage.women') %></h3>
57
+ </div>
58
+ <% end %>
65
59
 
66
60
  </div>
67
61
  </div>
@@ -71,7 +65,7 @@
71
65
 
72
66
  <div class="homepage-fashion-trends-box mb-3">
73
67
  <div class="text-center">
74
- <div class="homepage-fashion-trends-box-summer-text mb-1"><%= Spree.t('homepage.summer_2019') %></div>
68
+ <div class="homepage-fashion-trends-box-summer-text mb-1"><%= Spree.t('homepage.summer_2020') %></div>
75
69
  <div class="homepage-fashion-trends-box-fashion-trends-text mb-2"><%= Spree.t('homepage.fashion_trends') %></div>
76
70
  <div class="homepage-fashion-trends-box-description-text text-center mb-3">
77
71
  <%= Spree.t('homepage.fashion_trends_note') %>
@@ -20,7 +20,9 @@
20
20
  <%= yield :templates %>
21
21
  </div>
22
22
 
23
- <%= render 'spree/shared/copyright' %>
23
+ <footer>
24
+ <%= render 'spree/shared/copyright' %>
25
+ </footer>
24
26
  <%= render 'spree/shared/translations' %>
25
27
  </body>
26
28
  </html>
@@ -1,7 +1,7 @@
1
1
  <% if promotion.nil? %>
2
2
  <div class='shopping-cart-coupon-code <%= classes %>' data-hook='coupon_code'>
3
3
  <div class="input-group">
4
- <%= order_form.text_field :coupon_code, size: '30', class: 'form-control border-right-0', placeholder: Spree.t('cart_page.add_promo_code') %>
4
+ <%= order_form.text_field :coupon_code, size: '30', class: 'form-control border-right-0', placeholder: Spree.t('cart_page.add_promo_code'), aria: { label: Spree.t('cart_page.add_promo_code') } %>
5
5
  <div class="input-group-append">
6
6
  <%= button_tag '+', name: '', id: 'shopping-cart-coupon-code-button', class: 'btn border-left-0' %>
7
7
  </div>
@@ -6,7 +6,7 @@
6
6
  <%= link_to product_image(variant), variant.product %>
7
7
  </div>
8
8
  <div class="d-table-cell shopping-cart-item-description" data-hook="cart_item_description">
9
- <h4 class="item-title"><%= link_to line_item.name, spree.product_path(variant.product) %></h4>
9
+ <h2 class="item-title"><%= link_to line_item.name, spree.product_path(variant.product) %></h2>
10
10
  <% if line_item.insufficient_stock? %>
11
11
  <span class="out-of-stock">
12
12
  <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
@@ -10,7 +10,7 @@
10
10
  <div class="shopping-cart-item-quantity <%= additional_classes %>" data-hook="cart_item_quantity">
11
11
  <div class="d-flex align-items-center">
12
12
  <%= button_tag '-', type: 'button', class: "border-right-0 shopping-cart-item-quantity-decrease-btn", data: { id: dom_id(line_item) } %>
13
- <%= item_form.number_field :quantity, min: 0, class: "form-control text-center border-left-0 border-right-0 shopping-cart-item-quantity-input", size: 5, data: { id: dom_id(line_item) } %>
13
+ <%= item_form.number_field :quantity, min: 0, class: "form-control text-center border-left-0 border-right-0 shopping-cart-item-quantity-input", size: 5, data: { id: dom_id(line_item) }, aria: { label: Spree.t('cart_page.change_quantity') } %>
14
14
  <%= button_tag '+', type: 'button', class: "border-left-0 shopping-cart-item-quantity-increase-btn", data: { id: dom_id(line_item) } %>
15
15
  </div>
16
16
  </div>
@@ -22,7 +22,7 @@
22
22
  <% end %>
23
23
 
24
24
  <div class="shopping-cart-item-delete <%= additional_classes %>" data-hook="cart_item_delete">
25
- <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbolinks: false } do %>
25
+ <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbolinks: false }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
26
26
  <%= icon(name: 'garbage',
27
27
  classes: 'shopping-cart-item-delete-icon',
28
28
  width: 18.9,
@@ -13,7 +13,7 @@
13
13
  <% end %>
14
14
 
15
15
  <p class="order-show-number text-uppercase w-100 text-center">
16
- <%= accurate_title %> / <%= @order.completed_at.to_date.to_s(:long) %>
16
+ <%= accurate_title %> / <%= pretty_date(@order.completed_at) %>
17
17
  </p>
18
18
  <dl class="w-100 d-lg-flex justify-content-lg-between">
19
19
  <div>
@@ -16,6 +16,7 @@
16
16
 
17
17
  <% is_product_available_in_currency = product_available_in_currency? %>
18
18
  <% default_variant = default_variant(@variants, @product) %>
19
+ <% should_display_compare_at_price = default_variant.compare_at_price.present? && default_variant.compare_at_price > default_variant.price %>
19
20
 
20
21
  <%= form_for :order, html: {
21
22
  id: 'add-to-cart-form',
@@ -27,6 +28,11 @@
27
28
  <div id="inside-product-cart-form" data-hook="inside_product_cart_form">
28
29
  <% if is_product_available_in_currency %>
29
30
  <div id="product-price" class="mb-2 text-center text-md-left add-to-cart-form-price" data-hook="product_price">
31
+ <span class="compare-at-price">
32
+ <% if should_display_compare_at_price %>
33
+ <span class="mr-3"><%= display_compare_at_price(default_variant) %></span>
34
+ <% end %>
35
+ </span>
30
36
  <span class="price selling" content="<%= @product_price.to_d %>">
31
37
  <%= display_price(default_variant) %>
32
38
  </span>
@@ -52,7 +58,7 @@
52
58
  <ul id="product-variants" class="product-variants">
53
59
  <% used_variants_options(@variants, @product).each_with_index do |option_type, index| %>
54
60
  <li>
55
- <% if option_type[:name] == "color" %>
61
+ <% if Spree::OptionType.color&.name == option_type[:name] %>
56
62
  <%= render "color_option_type", option_type: option_type, index: index %>
57
63
  <% else %>
58
64
  <%= render "option_type", option_type: option_type, index: index %>
@@ -67,7 +73,7 @@
67
73
 
68
74
  <hr>
69
75
  <div>
70
- <div class="mb-5 mt-4">
76
+ <div class="mb-5 mt-4 text-center text-md-left">
71
77
  <%= render 'spree/shared/quantity_select', input_name: :quantity %>
72
78
  </div>
73
79
 
@@ -7,22 +7,23 @@
7
7
  <ol class="d-flex flex-wrap product-variants-variant-values">
8
8
  <% option_type[:option_values].each do |option_value| %>
9
9
  <li>
10
- <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",
11
- option_value[:id],
12
- option_value[:is_default] && index == 0,
13
- class: "product-variants-variant-values-radio",
14
- data: {
15
- "option-type-index" => index,
16
- "presentation" => option_value[:presentation],
17
- "variant-id" => option_value[:variant_id],
18
- "is-color" => true
19
- }
20
- %>
21
-
22
10
  <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
23
11
  class: "m-1 m-sm-2 m-md-1 color-select-label",
24
- tabindex: 0,
25
- "aria-label" => option_value[:presentation] do %>
12
+ title: option_value[:name],
13
+ data: { toggle: "tooltip", placement: "bottom" } do %>
14
+
15
+ <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",
16
+ option_value[:id],
17
+ option_value[:is_default] && index == 0,
18
+ class: "product-variants-variant-values-radio",
19
+ aria: { label: option_value[:name] },
20
+ data: {
21
+ "option-type-index" => index,
22
+ "presentation" => option_value[:presentation],
23
+ "variant-id" => option_value[:variant_id],
24
+ "is-color" => true
25
+ }
26
+ %>
26
27
 
27
28
  <%= render partial: "spree/shared/color_select", locals: {
28
29
  color: option_value[:presentation],
@@ -1,10 +1,18 @@
1
1
  <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:description) %></h3>
2
2
  <div id="product-description-short" class="m-0 text-break product-description" data-hook="description">
3
- <%= sanitize product_description(@product).truncate(450) %>
3
+ <% if Spree::Config[:show_raw_product_description] %>
4
+ <%= raw product_description(@product).truncate(450) %>
5
+ <% else %>
6
+ <%= sanitize product_description(@product).truncate(450) %>
7
+ <% end %>
4
8
  </div>
5
9
 
6
10
  <div id="product-description-long" class="m-0 text-break product-description d-none" data-hook="description">
7
- <%= sanitize product_description(@product) %>
11
+ <% if Spree::Config[:show_raw_product_description] %>
12
+ <%= raw product_description(@product) %>
13
+ <% else %>
14
+ <%= sanitize product_description(@product) %>
15
+ <% end %>
8
16
  </div>
9
17
 
10
18
  <% if product_description(@product).length > 450 %>
@@ -1,12 +1,39 @@
1
1
  <% cache base_cache_key + [available_option_types_cache_key, filtering_params_cache_key, @taxon&.id] do %>
2
2
  <div id="plp-filters-accordion" class="d-none d-lg-block col-lg-3 pr-5 position-sticky h-100 plp-filters" data-hook="taxon_sidebar_navigation">
3
- <% @available_option_types.each do |option_type| %>
4
- <div class="w-100 card plp-filters-card">
5
- <% ot_downcase_name = option_type.filter_param %>
6
- <% option_type_name = ot_downcase_name.titleize %>
3
+ <div class="plp-filters-scroller">
4
+ <% @available_option_types.each do |option_type| %>
5
+ <div class="w-100 card plp-filters-card">
6
+ <% ot_downcase_name = option_type.filter_param %>
7
+ <% option_type_name = ot_downcase_name.titleize %>
8
+ <% collapsed = params[ot_downcase_name].blank? %>
7
9
 
8
- <div class="card-header <%= 'collapsed' if params[ot_downcase_name].blank? %> px-1 plp-filters-card-header" id="filters<%= option_type_name %>" data-toggle="collapse" data-target="#collapseFilter<%= option_type_name %>" aria-expanded="false" aria-controls="collapseFilter<%= option_type_name %>" role="heading" aria-level="2">
9
- <%= option_type.presentation %>
10
+ <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= option_type_name %>" data-toggle="collapse" data-target="#collapseFilter<%= option_type_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= option_type_name %>" role="heading" aria-level="2">
11
+ <%= option_type.presentation %>
12
+ <%= icon(name: 'plus',
13
+ classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
14
+ width: 16,
15
+ height: 16) %>
16
+ <%= icon(name: 'minus',
17
+ classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
18
+ width: 16,
19
+ height: 16) %>
20
+ </button>
21
+ <div id="collapseFilter<%= option_type_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= option_type_name %>">
22
+ <div class="card-body px-0 pt-1">
23
+ <%= render 'spree/shared/option_values',
24
+ params_ot_downcase_name: params[ot_downcase_name],
25
+ option_type: option_type,
26
+ permitted_params: permitted_params,
27
+ ot_downcase_name: ot_downcase_name
28
+ %>
29
+ </div>
30
+ </div>
31
+ </div>
32
+ <% end %>
33
+ <% price_collapsed = params[:price].blank? %>
34
+ <div class="w-100 card plp-filters-card">
35
+ <button class="card-header text-capitalize <%= 'collapsed' if price_collapsed %> px-1 plp-filters-card-header" id="filtersPrice" data-toggle="collapse" data-target="#collapseFilterPrice" aria-expanded="<% !price_collapsed %>" aria-controls="collapseFilterPrice" role="heading" aria-level="2">
36
+ <%= Spree.t('plp.price') %>
10
37
  <%= icon(name: 'plus',
11
38
  classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
12
39
  width: 16,
@@ -15,45 +42,20 @@
15
42
  classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
16
43
  width: 16,
17
44
  height: 16) %>
18
- </div>
19
- <div id="collapseFilter<%= option_type_name %>" class="collapse <%= 'show' unless params[ot_downcase_name].blank? %>" aria-labelledby="filters<%= option_type_name %>">
45
+ </button>
46
+ <div id="collapseFilterPrice" class="collapse <%= 'show' unless price_collapsed %>" aria-labelledby="filtersPrice">
20
47
  <div class="card-body px-0 pt-1">
21
- <%= render 'spree/shared/option_values',
22
- params_ot_downcase_name: params[ot_downcase_name],
23
- option_type: option_type,
24
- permitted_params: permitted_params,
25
- ot_downcase_name: ot_downcase_name
26
- %>
27
- </div>
28
- </div>
29
- </div>
30
- <% end %>
31
-
32
- <div class="w-100 card plp-filters-card">
33
- <div class="card-header text-capitalize <%= 'collapsed' if params[:price].blank? %> px-1 plp-filters-card-header" id="filtersPrice" data-toggle="collapse" data-target="#collapseFilterPrice" aria-expanded="false" aria-controls="collapseFilterPrice" role="heading" aria-level="2">
34
- <%= Spree.t('plp.price') %>
35
- <%= icon(name: 'plus',
36
- classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
37
- width: 16,
38
- height: 16) %>
39
- <%= icon(name: 'minus',
40
- classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
41
- width: 16,
42
- height: 16) %>
43
- </div>
44
- <div id="collapseFilterPrice" class="collapse <%= 'show' unless params[:price].blank? %>" aria-labelledby="filtersPrice">
45
- <div class="card-body px-0 pt-1">
46
- <% price_filter_values.each do |name| %>
47
- <% price_param = params[:price] == name ? '' : name %>
48
- <%= link_to permitted_params.merge({ price: price_param }), class: "d-block" do %>
49
- <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-filters-card-item <%= 'plp-filters-card-item--selected' if params[:price] == name %>">
50
- <%= name %>
51
- </div>
48
+ <% price_filter_values.each do |name| %>
49
+ <% price_param = params[:price] == name ? '' : name %>
50
+ <%= link_to permitted_params.merge({ price: price_param }), class: "d-block" do %>
51
+ <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-filters-card-item <%= 'plp-filters-card-item--selected' if params[:price] == name %>">
52
+ <%= name %>
53
+ </div>
54
+ <% end %>
52
55
  <% end %>
53
- <% end %>
56
+ </div>
54
57
  </div>
55
58
  </div>
56
-
57
59
  <% additional_filters_partials.each do |partial| %>
58
60
  <%= render "spree/products/filters/#{partial}", permitted_params: permitted_params %>
59
61
  <% end %>
@@ -11,18 +11,18 @@
11
11
  </div>
12
12
  <div id="filters-accordion">
13
13
  <% available_option_types.each do |option_type| %>
14
- <% option_type_name = option_type.presentation.titleize.gsub(' ', '') %>
14
+ <% option_type_name = option_type.filter_param %>
15
15
  <% ot_downcase_name = option_type_name.downcase %>
16
16
 
17
17
  <div class="card plp-overlay-card">
18
- <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
18
+ <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
19
19
  <%= option_type_name %>
20
20
  <%= icon(name: 'arrow-right',
21
21
  classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
22
22
  width: 16,
23
23
  height: 16) %>
24
24
  </div>
25
- <div id="collapseFilterMobile<%= option_type_name %>" class="collapse <%= 'show' unless params[ot_downcase_name].blank? %>" aria-labelledby="collapseFilterMobile<%= option_type_name %>" data-parent="#filters-accordion">
25
+ <div id="collapseFilterMobile<%= option_type_name %>" class="collapse <%= 'show' unless params[ot_downcase_name].blank? %>" aria-labelledby="filtersMobile<%= option_type_name %>" data-parent="#filters-accordion">
26
26
  <div class="card-body pt-1">
27
27
  <%= render 'spree/shared/option_values', params_ot_downcase_name: params[ot_downcase_name], option_type: option_type, permitted_params: permitted_params, ot_downcase_name: ot_downcase_name %>
28
28
  </div>
@@ -42,7 +42,7 @@
42
42
  <div class="card-body pt-1">
43
43
  <% price_filter_values.each do |name| %>
44
44
  <% price_param = params[:price] == name ? '' : name %>
45
- <%= link_to permitted_params.merge(price: price_param, menu_open: 1) do %>
45
+ <%= link_to permitted_params.merge(price: price_param, menu_open: 1), data: { params: permitted_params.merge(price: price_param, menu_open: 1), filter_name: 'price' } do %>
46
46
  <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if params[:price] == name %>">
47
47
  <%= name %>
48
48
  </div>
@@ -60,7 +60,7 @@
60
60
  <% end %>
61
61
 
62
62
  <div class="container position-absolute text-center plp-overlay-buttons pt-3">
63
- <%= link_to Spree.t('plp.clear_all'), permitted_params.select { |key, value| key == "sort_by"}, class: 'btn spree-btn btn-outline-primary w-100 mb-4' %>
64
- <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100' %>
63
+ <%= link_to Spree.t('plp.clear_all'), permitted_params.select { |key, value| key == "sort_by"}, class: 'btn spree-btn btn-outline-primary w-100 mb-4', data: { params: permitted_params.select { |key, value| key == "sort_by"} } %>
64
+ <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100 done-btn', data: { params: permitted_params } %>
65
65
  </div>
66
66
  </div>
@@ -3,7 +3,7 @@
3
3
  <div class="modal-dialog--zoom modal-dialog mw-100 vh-100 mt-0 mb-0" role="document">
4
4
  <div class="modal-content h-100">
5
5
  <div class="modal-body h-100">
6
- <button type="button" class="close position-absolute" data-dismiss="modal" aria-label="Close">
6
+ <button type="button" class="close position-absolute mr-3" data-dismiss="modal" aria-label="Close">
7
7
  <span aria-hidden="true">
8
8
  <%= icon(name: 'close',
9
9
  classes: 'd-block d-lg-none',
@@ -20,7 +20,6 @@
20
20
 
21
21
  <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
22
22
  class: "m-1 select-label",
23
- tabindex: 0,
24
23
  "aria-label" => option_value[:presentation] do %>
25
24
 
26
25
  <span><%= option_value[:presentation] %></span>
@@ -2,10 +2,12 @@
2
2
  <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:details) %></h3>
3
3
  <ul id="product-properties" class="m-0 list-unstyled product-properies" data-hook>
4
4
  <% @product_properties.each do |product_property| %>
5
- <li>
6
- <span class="font-weight-bold text-break"><%= product_property.property.presentation %>:</span>
7
- <span class="text-break"><%= product_property.value %></span>
8
- </li>
5
+ <% if product_property.show_property? %>
6
+ <li>
7
+ <span class="font-weight-bold text-break"><%= product_property.property.presentation %>:</span>
8
+ <span class="text-break"><%= product_property.value %></span>
9
+ </li>
10
+ <% end %>
9
11
  <% end %>
10
12
  </ul>
11
13
  <% end %>
@@ -1,5 +1,5 @@
1
1
  <div class="container dropdown d-none d-lg-flex justify-content-end mt-5 pr-4 pb-3 plp-sort">
2
- <div data-toggle="dropdown" class="plp-sort-header">
2
+ <a data-toggle="dropdown" class="plp-sort-header" href="#" role="button" aria-haspopup="true" aria-expanded="false">
3
3
  <%= Spree.t("plp.#{ params[:sort_by].blank? ? 'sort_by': params[:sort_by].gsub('-', '_') }") %>
4
4
  <%= icon(name: 'arrow-right',
5
5
  classes: 'spree-icon-arrow spree-icon-arrow-up ml-3 plp-sort-header-arrow--up',
@@ -9,21 +9,21 @@
9
9
  classes: 'spree-icon-arrow spree-icon-arrow-down ml-3 plp-sort-header-arrow--down',
10
10
  width: 18,
11
11
  height: 18) %>
12
- </div>
12
+ </a>
13
13
 
14
14
  <div class="dropdown-menu text-right plp-sort-dropdown">
15
15
  <ul class="pt-1 plp-sort-dropdown-ul">
16
16
  <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by].blank? %>">
17
- <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)) %>
17
+ <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)), class: 'dropdown-item' %>
18
18
  </li>
19
19
  <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'newest-first' %>">
20
- <%= link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')) %>
20
+ <%= link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')), class: 'dropdown-item' %>
21
21
  </li>
22
22
  <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-high-to-low' %>">
23
- <%= link_to Spree.t('plp.price_high_to_low'), url_for(permitted_params.merge(sort_by: 'price-high-to-low')) %>
23
+ <%= link_to Spree.t('plp.price_high_to_low'), url_for(permitted_params.merge(sort_by: 'price-high-to-low')), class: 'dropdown-item' %>
24
24
  </li>
25
25
  <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-low-to-high' %>">
26
- <%= link_to Spree.t('plp.price_low_to_high'), url_for(permitted_params.merge(sort_by: 'price-low-to-high')) %>
26
+ <%= link_to Spree.t('plp.price_low_to_high'), url_for(permitted_params.merge(sort_by: 'price-low-to-high')), class: 'dropdown-item' %>
27
27
  </li>
28
28
  </ul>
29
29
  </div>