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
@@ -2,22 +2,31 @@
2
2
 
3
3
  <% Spree::Address::ADDRESS_FIELDS.each do |field| %>
4
4
  <% if field == "country" %>
5
- <p class="form-group checkout-content-inner-field" id="<%= "#{address_id}country" %>">
6
- <span id="<%= "#{address_id}country-selection" %>" class="d-block position-relative">
5
+ <div class="form-group checkout-content-inner-field" id="<%= "#{address_id}country" %>">
6
+ <div id="<%= "#{address_id}country-selection" %>" class="d-block position-relative has-float-label">
7
7
  <%= address_form.collection_select :country_id, available_countries, :id, :name,
8
8
  { prompt: Spree.t(:country).upcase },
9
- { class: 'required form-control spree-flat-select'} %>
9
+ { class: 'required form-control spree-flat-select',
10
+ aria: { label: Spree.t(:country) } } %>
10
11
  <%= image_tag 'arrow.svg', class: 'position-absolute spree-flat-select-arrow' %>
11
- </span>
12
- </p>
12
+ <%= address_form.label(Spree.t(:country), Spree.t(:country).upcase, class:'text-uppercase') %>
13
+ </div>
14
+ </div>
13
15
  <% elsif field == "state" %>
14
16
  <div class="form-group mb-4">
15
17
  <%= address_field(address_form, :state, address_id) { address_state(address_form, address.country, address_id) } if Spree::Config[:address_requires_state] %>
16
18
  </div>
19
+ <% elsif field == "zipcode" %>
20
+ <div class="form-group mb-4">
21
+ <%= address_field(address_form, :zipcode, address_id) { address_zipcode(address_form, address.country, address_id) } %>
22
+ </div>
17
23
  <% else %>
18
24
  <% next if field == "company" && !Spree::Config[:company] %>
19
25
  <% next if field == "alternative_#{address_id}_phone" && !Spree::Config["alternative_#{address_id}_phone"] %>
20
26
  <div class="form-group mb-4">
21
27
  <%= address_field(address_form, field.to_sym, address_id) %>
22
- </div> <% end %>
28
+ </div>
29
+ <% end %>
23
30
  <% end %>
31
+
32
+ <p class="text-right text-uppercase mb-5 checkout-content-inner-field"><span id="required_marker"><%= Spree.t(:required) %></span> <%= Spree.t(:required_fields) %></p>
@@ -1,13 +1,18 @@
1
1
  <%= render 'spree/shared/error_messages', target: @address %>
2
2
  <div class="col-lg-6 offset-lg-3">
3
- <h3 class="spree-header spree-mb-large spree-mt-large"><%= t(:edit_shipping_address, scope: :address_book) %></h3>
3
+ <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:edit_address, scope: :address_book) %></h3>
4
4
  <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
5
- <%= render 'spree/addresses/form',
6
- address_name: 'address',
7
- address_form: f,
8
- address_type: 'shipping',
9
- address: @address
10
- %>
11
- <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
5
+ <div class="form-group checkout-content-inner-field mb-5 has-float-label">
6
+ <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
7
+ <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
8
+ </div>
9
+
10
+ <%= render 'spree/addresses/form',
11
+ address_name: 'address',
12
+ address_form: f,
13
+ address_type: 'shipping',
14
+ address: @address
15
+ %>
16
+ <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
12
17
  <% end %>
13
18
  </div>
@@ -1,7 +1,11 @@
1
1
  <%= render 'spree/shared/error_messages', target: @address %>
2
2
  <div class="col-lg-6 offset-lg-3">
3
- <h3 class="spree-header spree-mb-large spree-mt-large"><%= t(:new_shipping_address, scope: :address_book) %></h3>
3
+ <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_address, scope: :address_book) %></h3>
4
4
  <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
5
+ <div class="form-group checkout-content-inner-field mb-5 has-float-label">
6
+ <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
7
+ <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
8
+ </div>
5
9
  <%= render 'spree/addresses/form',
6
10
  address_name: 'address',
7
11
  address_form: f,
@@ -3,12 +3,10 @@
3
3
  <% if !try_spree_current_user || try_spree_current_user.email.blank? %>
4
4
  <div class="row">
5
5
  <div class="col-12 mb-4">
6
- <p class="form-group checkout-content-inner-field">
7
- <%= form.label :email, class: 'text-uppercase' %>
8
- <span class="required">*</span>
9
- <br />
10
- <%= form.email_field :email, class: 'required spree-flat-input', required: true %>
11
- </p>
6
+ <div class="form-group checkout-content-inner-field has-float-label">
7
+ <%= form.email_field :email, class: 'required spree-flat-input', required: true, placeholder: Spree.t(:email) %>
8
+ <%= form.label :email, class: 'text-uppercase'%>
9
+ </div>
12
10
  </div>
13
11
  </div>
14
12
  <% end %>
@@ -31,23 +29,24 @@
31
29
  </div>
32
30
  <% end %>
33
31
  <% if @addresses.present? %>
34
- <div class="select_address">
35
- <div class="form-group">
32
+ <div class="select_address mb-5">
33
+ <div class="form-group col">
36
34
  <% @addresses.each_with_index do |address, idx| %>
37
- <span class="d-block mb-2" id="<%= [address_type, dom_id(address)].join('_') %>">
38
- <label class="form-check-label spree-radio-label">
35
+ <div class="row mb-3" id="<%= [address_type, dom_id(address)].join('_') %>">
36
+ <label class="form-check-label spree-radio-label col-8">
39
37
  <%= form.radio_button "#{address_name}_id", address.id, checked: (address.id == try_spree_current_user["#{address_name}_id"] || idx == 0) %>
40
38
  <span class="spree-radio-label-custom-input"></span>
41
- <span class="d-inline-block align-top">
42
39
  <%= render "spree/users/address", address: address %>
43
- </span>
44
40
  </label>
45
- </span>
41
+ <%= render "spree/users/address_controls", address: address %>
42
+ </div>
46
43
  <% end %>
47
- <label class="form-check-label spree-radio-label">
48
- <%= form.radio_button "#{address_name}_id", 0, class: 'form-check-input' %> <%= Spree.t('address_book.other_address') %>
49
- <span class="spree-radio-label-custom-input"></span>
50
- </label>
44
+ <div class="row mb-3">
45
+ <label class="form-check-label spree-radio-label col">
46
+ <%= form.radio_button "#{address_name}_id", 0, class: 'form-check-input' %> <h4><%= Spree.t('address_book.other_address') %></h4>
47
+ <span class="spree-radio-label-custom-input"></span>
48
+ </label>
49
+ </div>
51
50
  </div>
52
51
  </div>
53
52
  <% end %>
@@ -60,7 +59,6 @@
60
59
  address: Spree::Address.default,
61
60
  form: form
62
61
  } %>
63
- <p class="text-right text-uppercase checkout-content-inner-field">*<%= Spree.t(:required_fields) %></p>
64
62
  </div>
65
63
  <% end %>
66
64
  </div>
@@ -2,8 +2,9 @@
2
2
  <p class="checkout-content-header">
3
3
  <%= Spree.t(:summary).upcase %>
4
4
  </p>
5
- <div class='checkout-confirm-order-details d-flex flex-column flex-lg-wrap' id="order_summary" data-hook>
6
- <div class="checkout-confirm-order-details-line-items d-flex flex-column align-items-center w-100 order-0 order-lg-1">
5
+ <div class='checkout-confirm-order-details' id="order_summary" data-hook>
6
+ <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-none d-lg-block' } %>
7
+ <div class="checkout-confirm-order-details-line-items d-flex flex-column align-items-center w-100">
7
8
  <div class="checkout-confirm-order-details-line-items-header d-none d-sm-block d-lg-none align-self-start mb-3">
8
9
  <%= Spree.t(:products) %>
9
10
  </div>
@@ -25,51 +26,8 @@
25
26
  <%= render partial: 'spree/shared/line_item', collection: @order.line_items, cached: true %>
26
27
  </div>
27
28
  </div>
28
- <div class="checkout-confirm-delivery-informations text-left mt-3 order-1 order-lg-0">
29
- <div class="d-lg-none checkout-confirm-delivery-informations-header">
30
- <%= Spree.t(:delivery_information) %>
31
- </div>
32
- <dl>
33
- <div>
34
- <dt class="text-uppercase">
35
- <%= Spree.t(:shipping_address) %>
36
- <%= checkout_edit_link %>
37
- </dt>
38
- <dd><%= sanitize @order.ship_address.to_s, tags: %w[br] %></dd>
39
- </div>
40
- <div>
41
- <dt class="text-uppercase">
42
- <%= Spree.t(:billing_address) %>
43
- <%= checkout_edit_link %>
44
- </dt>
45
- <dd><%= sanitize @order.bill_address.to_s, tags: %w[br] %></dd>
46
- </div>
47
- <div>
48
- <dt class="text-uppercase">
49
- <%= Spree.t(:shipping) %>
50
- <%= checkout_edit_link('delivery') %>
51
- </dt>
52
- <% @order.shipments.pending.each do |shipment| %>
53
- <dd><%= shipment.shipping_method&.name %> </dd>
54
- <% end %>
55
- </div>
56
- <div>
57
- <dt class="text-uppercase">
58
- <%= Spree.t(:payment) %>
59
- <%= checkout_edit_link('payment') %>
60
- </dt>
61
- <dd>
62
- <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>
63
- </dd>
64
- <dd>
65
- <% if @order.using_store_credit? %>
66
- <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
67
- <% end %>
68
- </dd>
69
- </div>
70
- </dl>
71
- </div>
72
- <div id="checkout-summary" class="w-100 order-2" data-hook="checkout_summary_box">
29
+ <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-lg-none' } %>
30
+ <div id="checkout-summary" class="w-100" data-hook="checkout_summary_box">
73
31
  <%= render partial: 'spree/checkout/summary', locals: { order: @order } %>
74
32
  <div data-hook="buttons">
75
33
  <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>
@@ -3,9 +3,15 @@
3
3
  <div id="methods">
4
4
  <%= form.fields_for :shipments do |ship_form| %>
5
5
  <div class="shipment">
6
- <h4 class="text-uppercase checkout-content-header checkout-content-shipping-methods-header">
6
+ <h4 class="text-uppercase checkout-content-header checkout-content-shipping-methods-header mb-1">
7
7
  <%= Spree.t('checkout_page.delivery_method') %>
8
8
  </h4>
9
+ <div id="shipToLocation" class="mb-4 text-uppercase">
10
+ <%= Spree.t(:ship_to) %>
11
+ <span class="text-muted"><%= @order.shipping_address.address1 %></span> -
12
+ <% if @order.shipping_address.zipcode.present? %> <span class="text-muted"><%= @order.shipping_address.zipcode %></span> - <% end %>
13
+ <span class="text-muted"><%= @order.shipping_address.country_iso %></span>
14
+ </div>
9
15
 
10
16
  <ul class="checkout-content-shipping-methods-list">
11
17
  <% ship_form.object.shipping_rates.each do |rate| %>
@@ -28,13 +34,14 @@
28
34
  </div>
29
35
  <% end %>
30
36
  </div>
37
+
31
38
  <% if Spree::Config[:shipping_instructions] %>
32
- <p id="minstrs" data-hook>
39
+ <div id="minstrs" data-hook>
33
40
  <h4 class="h5">
34
41
  <%= Spree.t(:shipping_instructions) %>
35
42
  </h4>
36
43
  <%= form.text_area :special_instructions, cols: 40, rows: 4, class: "form-control" %>
37
- </p>
44
+ </div>
38
45
  <% end %>
39
46
  </div>
40
47
  </div>
@@ -0,0 +1,44 @@
1
+ <div class="checkout-confirm-delivery-informations text-left mt-3 <%= class_name %>">
2
+ <div class="d-lg-none checkout-confirm-delivery-informations-header">
3
+ <%= Spree.t(:delivery_information) %>
4
+ </div>
5
+ <dl>
6
+ <div>
7
+ <dt class="text-uppercase">
8
+ <%= Spree.t(:shipping_address) %>
9
+ <%= checkout_edit_link %>
10
+ </dt>
11
+ <dd><%= sanitize @order.ship_address.to_s, tags: %w[br] %></dd>
12
+ </div>
13
+ <div>
14
+ <dt class="text-uppercase">
15
+ <%= Spree.t(:billing_address) %>
16
+ <%= checkout_edit_link %>
17
+ </dt>
18
+ <dd><%= sanitize @order.bill_address.to_s, tags: %w[br] %></dd>
19
+ </div>
20
+ <div>
21
+ <dt class="text-uppercase">
22
+ <%= Spree.t(:shipping) %>
23
+ <%= checkout_edit_link('delivery') %>
24
+ </dt>
25
+ <% @order.shipments.pending.each do |shipment| %>
26
+ <dd><%= shipment.shipping_method&.name %> </dd>
27
+ <% end %>
28
+ </div>
29
+ <div>
30
+ <dt class="text-uppercase">
31
+ <%= Spree.t(:payment) %>
32
+ <%= checkout_edit_link('payment') %>
33
+ </dt>
34
+ <dd>
35
+ <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>
36
+ </dd>
37
+ <dd>
38
+ <% if @order.using_store_credit? %>
39
+ <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
40
+ <% end %>
41
+ </dd>
42
+ </div>
43
+ </dl>
44
+ </div>
@@ -4,16 +4,15 @@
4
4
  </p>
5
5
 
6
6
  <div data-hook="checkout_payment_step">
7
-
8
7
  <%= render partial: 'spree/checkout/payment/storecredit' %>
9
8
 
10
9
  <ul id="payment-method-fields" class="list-unstyled position-relative" data-hook>
11
- <% @order.available_payment_methods.each do |method| %>
10
+ <% checkout_available_payment_methods.each do |method| %>
12
11
  <li class="radio">
13
12
  <%= label_tag '', class: "form-check-label spree-radio-label payment-option", data: { type: method.id == @payment_sources&.first&.payment_method_id ? 'card' : nil } do %>
14
13
  <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
15
14
  method.id,
16
- method.id == @order.payments.checkout.last&.payment_method_id || method == @order.available_payment_methods.first %>
15
+ method.id == @order.payments.checkout.last&.payment_method_id || method == checkout_available_payment_methods.first %>
17
16
  <span class="spree-radio-label-custom-input"></span>
18
17
  <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
19
18
  <% end %>
@@ -22,29 +21,11 @@
22
21
  </ul>
23
22
 
24
23
  <div class="payment-sources">
25
- <% if @payment_sources.present? %>
26
- <div id="existing_cards" class="payment-sources-existing-cards">
27
- <%= radio_button_tag 'use_existing_card', 'yes', true, class: 'd-none' %>
28
- <div class="form-group" data-hook="existing_cards">
29
- <div class="d-flex flex-column payment-sources-list">
30
- <% @payment_sources.each do |card| %>
31
- <%= render partial: 'credit_card', locals: { card: card } %>
32
- <% end %>
33
- <div>
34
- <label class="form-check-label spree-radio-label col-6 mb-2">
35
- <%= radio_button_tag 'use_existing_card', 'no' %>
36
- <span class="spree-radio-label-custom-input"></span>
37
- <span><%= Spree.t(:add_new_credit_card) %></span>
38
- </label>
39
- </div>
40
- </div>
41
- </div>
42
- </div>
43
- <% end %>
24
+ <%= render partial: 'payment_sources' if @payment_sources.present? %>
44
25
 
45
26
  <ul id="payment-methods" class="list-unstyled position-relative mb-0 payment-sources-add-form" data-hook>
46
- <% @order.available_payment_methods.each do |method| %>
47
- <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods.last %>" data-hook>
27
+ <% checkout_available_payment_methods.each do |method| %>
28
+ <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == checkout_available_payment_methods.last %>" data-hook>
48
29
  <fieldset>
49
30
  <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
50
31
  </fieldset>
@@ -0,0 +1,17 @@
1
+ <div id="existing_cards" class="payment-sources-existing-cards" style="display:none;">
2
+ <%= radio_button_tag 'use_existing_card', 'yes', true, class: 'd-none' %>
3
+ <div class="form-group" data-hook="existing_cards">
4
+ <div class="d-flex flex-column payment-sources-list">
5
+ <% @payment_sources.each do |card| %>
6
+ <%= render partial: 'credit_card', locals: { card: card } %>
7
+ <% end %>
8
+ <div>
9
+ <label class="form-check-label spree-radio-label col-6 mb-2">
10
+ <%= radio_button_tag 'use_existing_card', 'no' %>
11
+ <span class="spree-radio-label-custom-input"></span>
12
+ <span><%= Spree.t(:add_new_credit_card) %></span>
13
+ </label>
14
+ </div>
15
+ </div>
16
+ </div>
17
+ </div>
@@ -27,24 +27,29 @@
27
27
  <% end %>
28
28
 
29
29
  <% if order.passed_checkout_step?("address") && order.shipments.any? %>
30
- <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
31
- <% shipping_total = Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency) %>
32
- <div class="d-table-cell text-right"
33
- data-hook='shipping-total'
34
- data-currency='<%= Money::Currency.find(order.currency).symbol %>'
35
- thousands-separator='<%= shipping_total.thousands_separator %>'
36
- decimal-mark='<%= shipping_total.decimal_mark %>'
37
- precision='<%= Money::Currency.find(order.currency).exponent %>'
38
- >
39
- <%= shipping_total.to_html %>
40
- </div>
30
+ <% if order.has_free_shipping? %>
31
+ <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
32
+ <div class="d-table-cell text-right"><%= Spree.t(:free) %></div>
33
+ <% else %>
34
+ <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
35
+ <% shipping_total = Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency) %>
36
+ <div class="d-table-cell text-right"
37
+ data-hook='shipping-total'
38
+ data-currency='<%= Money::Currency.find(order.currency).symbol %>'
39
+ thousands-separator='<%= shipping_total.thousands_separator %>'
40
+ decimal-mark='<%= shipping_total.decimal_mark %>'
41
+ precision='<%= Money::Currency.find(order.currency).exponent %>'
42
+ >
43
+ <%= shipping_total.to_html %>
44
+ </div>
41
45
 
42
- <% if order.shipment_adjustments.nonzero.exists? %>
43
- <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
44
- <div class="d-table-cell"><%= label %>:</div>
45
- <div class="d-table-cell text-right">
46
- <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
47
- </div>
46
+ <% if order.shipment_adjustments.nonzero.exists? %>
47
+ <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
48
+ <div class="d-table-cell"><%= label %>:</div>
49
+ <div class="d-table-cell text-right">
50
+ <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
51
+ </div>
52
+ <% end %>
48
53
  <% end %>
49
54
  <% end %>
50
55
  <% end %>
@@ -27,7 +27,7 @@ end
27
27
  <div class="text-uppercase checkout-header-title">
28
28
  <h1 data-hook="checkout_title"><%= Spree.t('checkout_page.header') %></h1>
29
29
  </div>
30
- <div class="checkout-progress" data-hook="checkout_progress">
30
+ <div class="checkout-progress" data-hook="checkout_progress" role="navigation" aria-label="<%= Spree.t('checkout_page.checkout_navigation') %>">
31
31
  <%= checkout_progress %>
32
32
  </div>
33
33
  </div>
@@ -18,7 +18,7 @@
18
18
  </div>
19
19
  <div class="payment-gateway-half-fields d-flex justify-content-between">
20
20
  <div class="payment-gateway-field checkout-content-inner-field" data-hook="card_expiration">
21
- <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: 'spree-flat-input cardExpiry', placeholder: "MM / YY" %>
21
+ <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: 'spree-flat-input cardExpiry', placeholder: "MM/YYYY" %>
22
22
  </div>
23
23
  <div class="payment-gateway-field checkout-content-inner-field" data-hook="card_code">
24
24
  <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(id: 'card_code', class: 'spree-flat-input cardCode', size: 5, placeholder: Spree.t(:cvv)) %>
@@ -18,10 +18,10 @@
18
18
  <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration' } do |f| %>
19
19
  <div class="form-group">
20
20
  <p class="form-group checkout-content-inner-field">
21
- <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email), autofocus: true %>
21
+ <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %>
22
22
  </p>
23
23
  </div>
24
- <%= f.submit Spree.t(:continue_as_guest), class: 'btn btn-block btn-outline-primary spree-btn', tabindex: 4 %>
24
+ <%= f.submit Spree.t(:continue_as_guest), class: 'btn btn-block btn-outline-primary spree-btn' %>
25
25
  <% end %>
26
26
  <% end %>
27
27
  </div>
@@ -1,7 +1,7 @@
1
1
  <div class="container">
2
2
  <div class="not-found-page text-center pt-5">
3
3
  <h1 class="display-1 text-primary">404</h1>
4
- <p><strong>Sorry! Page you are looking can’t be found.</strong></p>
5
- <p>Get back to the <%= link_to 'homepage', spree.root_url %>.</p>
4
+ <p><strong><%= Spree.t(:page_not_found) %></strong></p>
5
+ <p><%= Spree.t(:get_back_to_the) %> <%= link_to Spree.t(:home_page), spree.root_url %></p>
6
6
  </div>
7
7
  </div>