spree_frontend 4.1.15 → 4.2.0.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (366) 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/pagination-arrow-right.svg +3 -10
  263. data/app/assets/images/pagination-double-arrow-right.svg +6 -13
  264. data/app/assets/images/plus.svg +1 -1
  265. data/app/assets/images/search.svg +1 -1
  266. data/app/assets/javascripts/spree/frontend/checkout/address.js +19 -10
  267. data/app/assets/javascripts/spree/frontend/checkout/payment.js +31 -6
  268. data/app/assets/javascripts/spree/frontend/checkout.js +1 -1
  269. data/app/assets/javascripts/spree/frontend/login.js +5 -0
  270. data/app/assets/javascripts/spree/frontend/main_nav_bar.js +86 -0
  271. data/app/assets/javascripts/spree/frontend/multi_currency.js +13 -0
  272. data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js +53 -10
  273. data/app/assets/javascripts/spree/frontend/views/spree/products/index.js +84 -14
  274. data/app/assets/javascripts/spree/frontend/views/spree/shared/product_added_modal.js +7 -0
  275. data/app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js +93 -0
  276. data/app/assets/javascripts/spree/frontend.js +3 -0
  277. data/app/assets/stylesheets/spree/frontend/application.scss +4 -0
  278. data/app/assets/stylesheets/spree/frontend/components-bootstrap/carousel.scss +4 -0
  279. data/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss +74 -1
  280. data/app/assets/stylesheets/spree/frontend/flags/_flag-icon-base.scss +23 -0
  281. data/app/assets/stylesheets/spree/frontend/flags/_flag-icon-list.scss +265 -0
  282. data/app/assets/stylesheets/spree/frontend/flags/_variables.scss +2 -0
  283. data/app/assets/stylesheets/spree/frontend/flags/flag-icon.scss +3 -0
  284. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/delivery.scss +6 -0
  285. data/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss +2 -2
  286. data/app/assets/stylesheets/spree/frontend/views/spree/products/cart_form.scss +8 -0
  287. data/app/assets/stylesheets/spree/frontend/views/spree/products/gallery_modal.scss +1 -0
  288. data/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss +28 -4
  289. data/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss +7 -0
  290. data/app/assets/stylesheets/spree/frontend/views/spree/shared/_color_select.scss +10 -9
  291. data/app/assets/stylesheets/spree/frontend/views/spree/shared/carousel/single.scss +1 -1
  292. data/app/assets/stylesheets/spree/frontend/views/spree/shared/carousel/thumbnails.scss +1 -0
  293. data/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss +9 -4
  294. data/app/assets/stylesheets/spree/frontend/views/spree/shared/change_store.scss +7 -0
  295. data/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss +30 -25
  296. data/app/assets/stylesheets/spree/frontend/views/spree/shared/mobile_navigation.scss +29 -3
  297. data/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss +24 -7
  298. data/app/assets/stylesheets/spree/frontend/views/spree/shared/quantity_select.scss +9 -12
  299. data/app/assets/stylesheets/spree/frontend/views/spree/shared/search_form.scss +12 -0
  300. data/app/controllers/concerns/spree/checkout/address_book.rb +7 -9
  301. data/app/controllers/spree/addresses_controller.rb +0 -1
  302. data/app/controllers/spree/currency_controller.rb +17 -0
  303. data/app/controllers/spree/products_controller.rb +1 -1
  304. data/app/controllers/spree/store_controller.rb +4 -0
  305. data/app/helpers/spree/addresses_helper.rb +37 -7
  306. data/app/helpers/spree/frontend_helper.rb +26 -2
  307. data/app/helpers/spree/navigation_helper.rb +4 -1
  308. data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb +1 -1
  309. data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb +1 -1
  310. data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb +1 -1
  311. data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb +1 -1
  312. data/app/views/spree/address/_form.html.erb +22 -22
  313. data/app/views/spree/addresses/_form.html.erb +15 -6
  314. data/app/views/spree/checkout/_address.html.erb +4 -7
  315. data/app/views/spree/checkout/_confirm.html.erb +4 -46
  316. data/app/views/spree/checkout/_delivery.html.erb +10 -3
  317. data/app/views/spree/checkout/_delivery_informations.html.erb +44 -0
  318. data/app/views/spree/checkout/_payment.html.erb +4 -4
  319. data/app/views/spree/checkout/_summary.html.erb +22 -17
  320. data/app/views/spree/checkout/edit.html.erb +1 -1
  321. data/app/views/spree/checkout/payment/_gateway.html.erb +1 -1
  322. data/app/views/spree/checkout/registration.html.erb +2 -2
  323. data/app/views/spree/errors/not_found.html.erb +2 -2
  324. data/app/views/spree/home/index.html.erb +29 -35
  325. data/app/views/spree/layouts/checkout.html.erb +3 -1
  326. data/app/views/spree/orders/_coupon_code.html.erb +1 -1
  327. data/app/views/spree/orders/_line_item.html.erb +1 -1
  328. data/app/views/spree/orders/_line_item_data.html.erb +2 -2
  329. data/app/views/spree/orders/show.html.erb +1 -1
  330. data/app/views/spree/products/_cart_form.html.erb +8 -2
  331. data/app/views/spree/products/_color_option_type.html.erb +15 -14
  332. data/app/views/spree/products/_description.html.erb +10 -2
  333. data/app/views/spree/products/_filters_desktop.html.erb +43 -41
  334. data/app/views/spree/products/_filters_mobile.html.erb +6 -6
  335. data/app/views/spree/products/_gallery_modal.html.erb +1 -1
  336. data/app/views/spree/products/_option_type.html.erb +0 -1
  337. data/app/views/spree/products/_properties.html.erb +6 -4
  338. data/app/views/spree/products/_sort_desktop.html.erb +6 -6
  339. data/app/views/spree/products/_sort_mobile.html.erb +8 -8
  340. data/app/views/spree/products/_vendor_info.html.erb +13 -0
  341. data/app/views/spree/products/show.html.erb +3 -0
  342. data/app/views/spree/shared/_breadcrumbs.html.erb +2 -2
  343. data/app/views/spree/shared/_carousel_4_products.html.erb +1 -1
  344. data/app/views/spree/shared/_cart.html.erb +1 -1
  345. data/app/views/spree/shared/_change_store.html.erb +25 -0
  346. data/app/views/spree/shared/_checkout_header.html.erb +2 -2
  347. data/app/views/spree/shared/_footer.html.erb +12 -8
  348. data/app/views/spree/shared/_link_to_account.html.erb +1 -0
  349. data/app/views/spree/shared/_link_to_cart.html.erb +1 -2
  350. data/app/views/spree/shared/_login.html.erb +4 -4
  351. data/app/views/spree/shared/_main_nav_bar.html.erb +46 -40
  352. data/app/views/spree/shared/_mobile_change_store.html.erb +30 -0
  353. data/app/views/spree/shared/_mobile_navigation.html.erb +29 -52
  354. data/app/views/spree/shared/_nav_bar.html.erb +6 -16
  355. data/app/views/spree/shared/_option_values.html.erb +2 -2
  356. data/app/views/spree/shared/_quantity_select.html.erb +1 -1
  357. data/app/views/spree/shared/_search.html.erb +8 -11
  358. data/app/views/spree/shared/_taxonomies.html.erb +1 -1
  359. data/app/views/spree/shared/carousel/_thumbnails.html.erb +32 -30
  360. data/app/views/spree/users/_address.html.erb +17 -21
  361. data/app/views/spree/users/show.html.erb +2 -2
  362. data/config/initializers/canonical_rails.rb +1 -1
  363. data/config/routes.rb +2 -0
  364. data/spree_frontend.gemspec +5 -5
  365. metadata +302 -21
  366. data/app/assets/stylesheets/spree/frontend/_glyphicons_urls_fix.scss +0 -10
@@ -1,36 +1,22 @@
1
1
  <% if spree_navigation_data.any? %>
2
- <div class="position-fixed text-uppercase d-xl-none mobile-navigation">
3
- <div class="d-flex align-items-center header-spree" data-hook>
4
- <div class="container-fluid header-spree-fluid">
5
- <div class="d-flex flex-nowrap align-items-center">
6
- <div class="d-xl-none flex-grow-1">
7
- <button id="mobile-navigation-back-button" aria-label="<%= Spree.t('nav_bar.go_to_previous_menu') %>">
8
- <%= icon(name: 'arrow-right',
9
- classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-left',
10
- width: 18,
11
- height: 18) %>
12
- <%= icon(name: 'arrow-right',
13
- classes: 'd-none d-sm-inline spree-icon-arrow spree-icon-arrow-left',
14
- width: 17,
15
- height: 28) %>
16
- </button>
17
- </div>
18
- <figure class="logo flex-grow-0 flex-xl-grow-1 order-xl-0 header-spree-fluid-logo" data-hook>
19
- <%= logo %>
20
- </figure>
21
- <div id="top-nav-bar-mobile" class="text-right flex-grow-1 header-spree-fluid-secondary-navigation" data-hook>
22
- <button id="mobile-navigation-close-button" aria-label="<%= Spree.t('nav_bar.close_menu') %>">
23
- <%= icon(name: 'close',
24
- classes: 'd-sm-none',
25
- width: 17,
26
- height: 17) %>
27
- <%= icon(name: 'close',
28
- classes: 'd-none d-sm-inline',
29
- width: 26,
30
- height: 26) %>
31
- </button>
32
- </div>
33
- </div>
2
+ <div class="position-fixed text-uppercase d-xl-none mobile-navigation" role="navigation" aria-label="<%= Spree.t('nav_bar.mobile') %>">
3
+ <div class="container d-flex align-items-center justify-content-between header-spree" data-hook>
4
+ <button class="m-0 p-0" id="mobile-navigation-back-button" aria-label="<%= Spree.t('nav_bar.go_to_previous_menu') %>">
5
+ <%= icon(name: 'arrow-right',
6
+ classes: 'd-inline spree-icon-arrow spree-icon-arrow-left',
7
+ width: 26,
8
+ height: 26) %>
9
+ </button>
10
+ <figure class="logo header-spree-fluid-logo" data-hook>
11
+ <%= logo %>
12
+ </figure>
13
+ <div id="top-nav-bar-mobile" class="m-0 p-0 header-spree-fluid-secondary-navigation" data-hook>
14
+ <button id="mobile-navigation-close-button" aria-label="<%= Spree.t('nav_bar.close_menu') %>">
15
+ <%= icon(name: 'close',
16
+ classes: 'd-inline',
17
+ width: 26,
18
+ height: 26) %>
19
+ </button>
34
20
  </div>
35
21
  </div>
36
22
 
@@ -38,20 +24,14 @@
38
24
  <% spree_navigation_data.each do |root| %>
39
25
  <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">
40
26
  <%= link_to root[:title], root[:url], class: 'w-75' %>
41
-
42
- <a class="w-25 text-right mobile-navigation-category-link" data-category="<%= root[:title].parameterize %>" href="#" aria-label="<%= Spree.t('go_to_category')%>">
43
- <%= icon(name: 'arrow-right',
44
- classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-right',
45
- width: 16,
46
- height: 16) %>
47
- <%= icon(name: 'arrow-right',
48
- classes: 'd-none d-sm-inline spree-icon-arrow spree-icon-arrow-right',
49
- width: 14,
50
- height: 27) %>
51
- </a>
52
-
53
- <ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="<%= root[:title].parameterize %>">
54
- <% if root[:items].present? %>
27
+ <% if root[:items].present? %>
28
+ <a class="w-25 text-right mobile-navigation-category-link" data-category="<%= root[:title].parameterize %>" href="#" aria-label="<%= Spree.t('go_to_category')%>">
29
+ <%= icon(name: 'arrow-right',
30
+ classes: 'd-inline spree-icon-arrow spree-icon-arrow-right',
31
+ width: 14,
32
+ height: 27) %>
33
+ </a>
34
+ <ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="<%= root[:title].parameterize %>">
55
35
  <li class="text-center font-weight-bold mobile-navigation-sublist-header">
56
36
  <%= root[:title] %>
57
37
  </li>
@@ -60,14 +40,11 @@
60
40
  <%= link_to item[:title], item[:url], class: 'w-75' %>
61
41
  </li>
62
42
  <% end %>
63
- <% else %>
64
- <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">
65
- <%= link_to root[:title], root[:url], class: 'w-75' %>
66
- </li>
67
- <% end %>
68
- </ul>
43
+ </ul>
44
+ <% end %>
69
45
  </li>
70
46
  <% end %>
47
+ <%= render partial: 'spree/shared/mobile_change_store' %>
71
48
  </ul>
72
49
  </div>
73
50
  <% end %>
@@ -1,16 +1,11 @@
1
- <ul id="nav-bar" class="nav align-items-center d-flex justify-content-end navbar-right">
1
+ <ul id="nav-bar" class="nav align-items-center d-flex flex-nowrap justify-content-end navbar-right">
2
2
  <li>
3
3
  <div class="navbar-right-search-menu">
4
4
  <button type="button" class="navbar-right-dropdown-toggle search-icons" aria-label="<%= Spree.t('nav_bar.show_search')%>">
5
5
  <%= icon(name: 'magnifying-glass',
6
- classes: 'd-none d-xl-inline-block',
6
+ classes: 'd-inline-block',
7
7
  width: 36,
8
8
  height: 36) %>
9
-
10
- <%= icon(name: 'magnifying-glass',
11
- classes: 'd-xl-none',
12
- width: 24,
13
- height: 24) %>
14
9
  </button>
15
10
 
16
11
  <div id="search-dropdown" class="p-0 px-md-4 py-md-2 w-100 shadow navbar-right-search-menu-dropdown hide-on-esc">
@@ -21,16 +16,11 @@
21
16
  <% if defined?(spree.account_link_path) %>
22
17
  <li>
23
18
  <div class="dropdown navbar-right-dropdown">
24
- <button id="account-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.show_user_menu')%>">
19
+ <button id="account-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle account-icon" aria-label="<%= Spree.t('nav_bar.show_user_menu')%>">
25
20
  <%= icon(name: 'person',
26
- classes: 'd-none d-xl-inline-block',
21
+ classes: 'd-inline-block',
27
22
  width: 41.4,
28
23
  height: 36) %>
29
-
30
- <%= icon(name: 'person',
31
- classes: 'd-xl-none',
32
- width: 27.6,
33
- height: 24) %>
34
24
  </button>
35
25
 
36
26
  <div id="link-to-account" class="dropdown-menu dropdown-menu-right text-right">
@@ -39,7 +29,7 @@
39
29
  </li>
40
30
  <% end %>
41
31
  <li id="link-to-cart">
42
- <%= render 'spree/shared/cart', class: 'd-none d-xl-inline-block cart-icon--xl', size: 36, item_count: 0 %>
43
- <%= render 'spree/shared/cart', class: 'd-xl-none', size: 24, item_count: 0 %>
32
+ <%= render 'spree/shared/cart', class: 'd-inline-block cart-icon', size: 36, item_count: 0 %>
44
33
  </li>
34
+ <%= render partial: 'spree/shared/change_store' %>
45
35
  </ul>
@@ -5,8 +5,8 @@
5
5
  <% name = option_value.name %>
6
6
 
7
7
  <% option_value_param = (selected_option_values.include?(id) ? selected_option_values - [id] : selected_option_values + [id]).join(',') %>
8
- <%= link_to permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1) do %>
9
- <% if ot_downcase_name == 'color' %>
8
+ <%= link_to permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1), data: { params: permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1), id: id, filter_name: ot_downcase_name, multiselect: true } do %>
9
+ <% if Spree::OptionType.color&.name&.downcase == ot_downcase_name %>
10
10
 
11
11
  <span class="d-inline-block mb-1">
12
12
  <%= render partial: 'spree/shared/color_select', locals: {
@@ -1,5 +1,5 @@
1
1
  <%# TODO: Use in cart %>
2
- <div class="d-flex quantity-select mx-auto mx-md-0">
2
+ <div class="d-inline-flex quantity-select">
3
3
  <%= button_tag '-', type: 'button', class: "border-right-0 flex-grow-0 flex-shrink-0 py-0 px-3 quantity-select-decrease" %>
4
4
  <%= number_field_tag input_name, 1, min: 1, max: maximum_quantity, class: "p-0 flex-grow-1 flex-shrink-1 text-center form-control border-left-0 border-right-0 quantity-select-value", 'aria-label': Spree.t('pdp.quantity') %>
5
5
  <%= button_tag '+', type: 'button', class: "border-left-0 flex-grow-0 flex-shrink-0 py-0 px-3 quantity-select-increase" %>
@@ -1,19 +1,16 @@
1
- <%= form_tag spree.products_path, method: :get, class: "py-md-1 d-flex align-items-center" do %>
1
+ <%= form_tag spree.products_path, method: :get, class: "py-md-1 d-flex align-items-center search-form" do %>
2
2
  <%= search_field_tag :keywords,
3
3
  params[:keywords],
4
4
  placeholder: Spree.t(:search),
5
+ title: Spree.t(:search),
5
6
  autofocus: true,
7
+ 'aria-label': Spree.t(:search),
6
8
  class: " border-0 p-3"
7
9
  %>
8
- <label class="m-0">
9
- <input type="submit">
10
+ <button type="submit" class="btn border-0 p-0" aria-label="Submit">
10
11
  <%= icon(name: 'search',
11
- classes: 'd-md-none',
12
- width: 20,
13
- height: 20) %>
14
- <%= icon(name: 'search',
15
- classes: 'd-none d-md-inline',
16
- width: 27,
17
- height: 27) %>
18
- </label>
12
+ classes: 'd-inline',
13
+ width: 27,
14
+ height: 27) %>
15
+ </button>
19
16
  <% end %>
@@ -1,6 +1,6 @@
1
1
  <% max_level = Spree::Config[:max_level_in_taxons_menu] || 1 %>
2
2
 
3
- <nav id="taxonomies" class="sidebar-item" data-hook arial->
3
+ <nav id="taxonomies" class="sidebar-item" data-hook aria-label="taxonomies">
4
4
  <% @taxonomies.each do |taxonomy| %>
5
5
  <% cache [I18n.locale, taxonomy, max_level, @taxon] do %>
6
6
  <% if taxonomy.root.children.any? %>
@@ -11,9 +11,9 @@
11
11
  <div class="carousel-inner order-1 h-100">
12
12
  <% images.each_with_index do |image, image_index| %>
13
13
  <% if image_index % per_page == 0 %>
14
- <div class="carousel-item product-thumbnails-carousel-item<%= ' active' if image_index == 0 %>">
14
+ <div class="carousel-item product-thumbnails-carousel-item h-100<%= ' active' if image_index == 0 %>">
15
15
  <div class="h-100 d-flex flex-column justify-content-center">
16
- <div class="product-thumbnails-carousel-item-content py-1">
16
+ <div class="product-thumbnails-carousel-item-content py-1 h-100">
17
17
  <% end %>
18
18
  <div
19
19
  class="product-thumbnails-carousel-item-single product-thumbnails-carousel-item-single--visible"
@@ -37,32 +37,34 @@
37
37
  <% end %>
38
38
  <% end %>
39
39
  </div>
40
- <a
41
- class="d-none d-sm-flex order-0 justify-content-center w-100 product-thumbnails-carousel-previous"
42
- href="#<%= id %>"
43
- role="button"
44
- data-slide="prev"
45
- >
46
- <span aria-hidden="true">
47
- <%= icon(name: 'arrow-right',
48
- classes: 'spree-icon-arrow spree-icon-arrow-up',
49
- width: 16,
50
- height: 16) %>
51
- </span>
52
- <span class="sr-only"><%= Spree.t(:previous) %></span>
53
- </a>
54
- <a
55
- class="d-none d-sm-flex order-2 justify-content-center w-100 product-thumbnails-carousel-next"
56
- href="#<%= id %>"
57
- role="button"
58
- data-slide="next"
59
- >
60
- <span aria-hidden="true">
61
- <%= icon(name: 'arrow-right',
62
- classes: 'spree-icon-arrow spree-icon-arrow-down',
63
- width: 16,
64
- height: 16) %>
65
- </span>
66
- <span class="sr-only"><%= Spree.t(:next) %></span>
67
- </a>
40
+ <% if images.length > per_page %>
41
+ <a
42
+ class="d-none d-sm-flex order-0 justify-content-center w-100 product-thumbnails-carousel-previous"
43
+ href="#<%= id %>"
44
+ role="button"
45
+ data-slide="prev"
46
+ >
47
+ <span aria-hidden="true">
48
+ <%= icon(name: 'arrow-right',
49
+ classes: 'spree-icon-arrow spree-icon-arrow-up',
50
+ width: 16,
51
+ height: 16) %>
52
+ </span>
53
+ <span class="sr-only"><%= Spree.t(:previous) %></span>
54
+ </a>
55
+ <a
56
+ class="d-none d-sm-flex order-2 justify-content-center w-100 product-thumbnails-carousel-next"
57
+ href="#<%= id %>"
58
+ role="button"
59
+ data-slide="next"
60
+ >
61
+ <span aria-hidden="true">
62
+ <%= icon(name: 'arrow-right',
63
+ classes: 'spree-icon-arrow spree-icon-arrow-down',
64
+ width: 16,
65
+ height: 16) %>
66
+ </span>
67
+ <span class="sr-only"><%= Spree.t(:next) %></span>
68
+ </a>
69
+ <% end %>
68
70
  </div>
@@ -1,25 +1,21 @@
1
- <div class="row">
2
- <address class="mb-0 col-10">
3
- <span class="account-page-user-full-name">
4
- <%= address.full_name %>
5
- </span>
1
+ <div class="d-flex align-items-start justify-content-between">
2
+ <div class="row">
3
+ <address class="mb-0 col-12">
4
+ <span class="account-page-user-full-name">
5
+ <%= address.full_name %>
6
+ </span>
6
7
 
7
- <div><%= "#{address.address1} #{address.address2}" %>,</div>
8
- <div><%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,</div>
9
- <div><%= address.country.name %></div>
10
- </address>
11
- <div class="col-2">
12
- <div class="row">
13
- <div class="col-5 offset-md-2 order-1">
14
- <%= link_to spree.edit_address_path(address), method: :get, class: 'address-button', data: { hook: 'edit_address' } do %>
15
- <%= inline_svg_tag 'edit.svg', class: "delete-address-img" %>
16
- <% end %>
17
- </div>
18
- <div class="col-5 offset-2 offset-md-0 order-0">
19
- <div class="bg-transparent border-0 p-0 m-0 address-button delete-button js-delete-address-link" data-address="<%= spree.address_path(address) %>">
20
- <%= inline_svg_tag 'garbage_2.svg', class: "delete-address-img" %>
21
- </div>
22
- </div>
8
+ <div><%= "#{address.address1} #{address.address2}" %>,</div>
9
+ <div><%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,</div>
10
+ <div><%= address.country.name %></div>
11
+ </address>
12
+ </div>
13
+ <div class="d-flex ml-2">
14
+ <div role="button" class="bg-transparent border-0 px-1 mr-1 address-button delete-button js-delete-address-link" data-address="<%= spree.address_path(address) %>">
15
+ <%= inline_svg_tag 'garbage_2.svg', class: "delete-address-img" %>
23
16
  </div>
17
+ <%= link_to spree.edit_address_path(address), method: :get, class: 'address-button px-1', role: 'button', data: { hook: 'edit_address' } do %>
18
+ <%= inline_svg_tag 'edit.svg', class: "delete-address-img" %>
19
+ <% end %>
24
20
  </div>
25
21
  </div>
@@ -4,7 +4,7 @@
4
4
  <div class="row">
5
5
  <div class="col-xs-12 col-lg-4">
6
6
  <dt class="text-uppercase account-page-user-info-item-title">
7
- <%= Spree.t(:email) %>
7
+ <%= Spree.t(:account_info) %>
8
8
  <%= link_to spree.edit_user_path(@user), class: "account-page-user-info-item-title-edit" do %>
9
9
  <%= inline_svg_tag 'edit.svg', class: "account-page-user-info-item-title-edit-img" %>
10
10
  <% end %>
@@ -13,7 +13,7 @@
13
13
 
14
14
  <div class="d-lg-inline-block account-page-user-info-item-store-credits">
15
15
  <p class="my-0 text-uppercase text-center">
16
- <%= Spree.t(:store_credit_name) %>: <b class="account-page-user-info-item-store-credits-amount"><%= Spree::Money.new(@user.total_available_store_credit).to_s.gsub('.00', '') %></b>
16
+ <%= Spree.t(:store_credit_name) %>: <b class="account-page-user-info-item-store-credits-amount"><%= Spree::Money.new(@user.total_available_store_credit(current_currency), currency: current_currency).to_s.gsub('.00', '') %></b>
17
17
  </p>
18
18
  </div>
19
19
  </div>
@@ -10,5 +10,5 @@ CanonicalRails.setup do |config|
10
10
  # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
11
11
  # Unless whitelisted, these parameters will be omitted
12
12
 
13
- config.allowed_parameters = [:keywords, :page, :search, :taxon]
13
+ config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
14
14
  end
data/config/routes.rb CHANGED
@@ -35,4 +35,6 @@ Spree::Core::Engine.add_routes do
35
35
  get '/api_tokens', to: 'store#api_tokens'
36
36
  post '/ensure_cart', to: 'store#ensure_cart'
37
37
  get '/products/:id/related', to: 'products#related'
38
+
39
+ get '/currency/set', to: 'currency#set', defaults: { format: :json }, as: :set_currency
38
40
  end
@@ -5,11 +5,11 @@ Gem::Specification.new do |s|
5
5
  s.platform = Gem::Platform::RUBY
6
6
  s.name = 'spree_frontend'
7
7
  s.version = Spree.version
8
- s.author = 'Sean Schofield'
9
- s.email = 'sean@spreecommerce.com'
8
+ s.authors = ['Sean Schofield', 'Spark Solutions']
9
+ s.email = 'hello@spreecommerce.org'
10
10
  s.summary = 'Frontend e-commerce functionality for the Spree project.'
11
11
  s.description = s.summary
12
- s.homepage = 'http://spreecommerce.org'
12
+ s.homepage = 'https://spreecommerce.org'
13
13
  s.license = 'BSD-3-Clause'
14
14
 
15
15
  s.metadata = {
@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
28
28
  s.add_dependency 'spree_api', s.version
29
29
  s.add_dependency 'spree_core', s.version
30
30
 
31
- s.add_dependency 'bootstrap', '~> 4.3.1'
31
+ s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.6.0'
32
32
  s.add_dependency 'glyphicons', '~> 1.0.2'
33
- s.add_dependency 'canonical-rails', '~> 0.2.10'
33
+ s.add_dependency 'canonical-rails', '~> 0.2.5'
34
34
  s.add_dependency 'inline_svg', '~> 1.5'
35
35
  s.add_dependency 'jquery-rails', '~> 4.3'
36
36
  s.add_dependency 'turbolinks', '~> 5.2.0'