spree_core 5.1.8 → 5.2.0.rc1

data/app/assets/images/payment_icons/usdc.svg

@@ -0,0 +1 @@
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-labelledby="pi-usdc" role="img"><title id="pi-usdc">USDC</title><g clip-path="url(#pi-usdc-clip0)"><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#fff"/><path d="M19 20.2a8.2 8.2 0 100-16.4 8.2 8.2 0 000 16.4z" fill="#0B53BF"/><path d="M20.98 13.054c0-1.035-.629-1.384-1.847-1.552-.9-.13-1.075-.34-1.075-.76s.305-.682.888-.682c.53 0 .837.184.963.612a.225.225 0 00.214.164h.466a.208.208 0 00.208-.242c-.148-.675-.603-1.082-1.317-1.209v-.712a.222.222 0 00-.221-.222h-.445a.222.222 0 00-.222.222v.687c-.886.125-1.447.71-1.447 1.462 0 .97.592 1.348 1.828 1.515.84.138 1.08.32 1.08.797 0 .478-.406.798-.98.798-.773 0-1.035-.338-1.122-.777a.224.224 0 00-.218-.18h-.505a.206.206 0 00-.206.24c.13.74.604 1.28 1.57 1.41v.702a.222.222 0 00.222.222h.445a.222.222 0 00.221-.222v-.7c.917-.146 1.5-.779 1.5-1.573z" fill="#fff"/><path d="M17.32 16.597a4.896 4.896 0 010-9.195.354.354 0 00.211-.308v-.458a.232.232 0 00-.208-.253.231.231 0 00-.118.02 5.874 5.874 0 000 11.193.231.231 0 00.326-.233v-.456a.354.354 0 00-.21-.309l-.001-.001zm3.474-10.193a.232.232 0 00-.326.233v.457a.352.352 0 00.211.308 4.896 4.896 0 010 9.196.325.325 0 00-.21.309v.457a.233.233 0 00.326.233 5.874 5.874 0 000-11.193h-.001z" fill="#fff"/></g><defs><clipPath id="pi-usdc-clip0"><path fill="#fff" d="M0 0h38v24H0z"/></clipPath></defs></svg>

data/app/assets/images/payment_icons/usdt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-usdt"><title id="pi-usdt">USDT</title><path fill="#000" opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><g fill-rule="evenodd"><path d="M12.962 4.439l-3.249 6.825a.132.132 0 00.029.154l8.775 8.409a.134.134 0 00.186 0l8.775-8.409a.132.132 0 00.028-.154l-3.249-6.825a.131.131 0 00-.12-.077H13.083a.131.131 0 00-.12.077z" fill="#50af95"/><path d="M19.737 11.964c-.063.005-.388.024-1.114.024-.578 0-.987-.017-1.131-.024-2.232-.097-3.898-.486-3.898-.952s1.666-.853 3.898-.953v1.518c.145.011.564.036 1.141.036.693 0 1.04-.029 1.103-.035v-1.517c2.226.099 3.888.487 3.888.952s-1.66.852-3.889.95zm0-2.06V8.546h3.108V6.475h-8.461v2.071h3.107v1.357c-2.526.117-4.425.617-4.425 1.216s1.899 1.1 4.425 1.216v4.352h2.246v-4.354c2.52-.116 4.416-.615 4.416-1.215s-1.894-1.098-4.416-1.215zm0 0z" fill="#fff"/></g></svg>

data/app/assets/images/payment_icons/venmo.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 38 24" width="38" height="24" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-venmo"><title id="pi-venmo">Venmo</title><g fill="none" fill-rule="evenodd"><rect fill-opacity=".07" fill="#000" width="38" height="24" rx="3"/><path fill="#3D95CE" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path d="M24.675 8.36c0 3.064-2.557 7.045-4.633 9.84h-4.74L13.4 6.57l4.151-.402 1.005 8.275c.94-1.566 2.099-4.025 2.099-5.702 0-.918-.154-1.543-.394-2.058l3.78-.783c.437.738.634 1.499.634 2.46z" fill="#FFF" fill-rule="nonzero"/></g></svg>

data/app/assets/images/payment_icons/vipps.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="24" aria-labelledby="pi-vipps" role="img" viewBox="0 0 38 24"><title id="pi-vipps">Vipps</title><path fill="#000" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" opacity=".07"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path fill="#ff5b24" d="M3 2h32c.5 0 1 .4 1 1v18c0 .5-.4 1-1 1H3c-.5 0-1-.4-1-1V3c0-.5.4-1 1-1z"/><path fill="#fff" d="m7.45 9.26 1.2 3.52 1.2-3.52h1.4l-2.08 5.22H8.13L6.05 9.26zm6.91 4.38a2.17 2.17 0 0 0 1.84-1.04c.26-.32.59-.4.83-.2a.6.6 0 0 1 0 .88 3.27 3.27 0 0 1-2.67 1.43 3.54 3.54 0 0 1-3-1.81.56.56 0 0 1 .06-.8.57.57 0 0 1 .8.24 2.58 2.58 0 0 0 2.14 1.3zm1.63-2.9a.7.7 0 1 1-.7-.7.71.71 0 0 1 .7.7zm3.31-1.48v.71a1.97 1.97 0 0 1 1.7-.84c1.01 0 2.2.84 2.2 2.67 0 1.9-1.13 2.82-2.31 2.82a1.88 1.88 0 0 1-1.6-.83v2.5h-1.28V9.26zm0 2.6c0 1.05.61 1.62 1.3 1.62.67 0 1.31-.51 1.31-1.62 0-1.09-.64-1.6-1.31-1.6-.69 0-1.3.49-1.3 1.6zm6.13-2.6v.71a1.97 1.97 0 0 1 1.69-.84c1.02 0 2.2.84 2.2 2.67 0 1.9-1.13 2.82-2.3 2.82a1.88 1.88 0 0 1-1.6-.83v2.5h-1.28V9.26zm0 2.6c0 1.05.61 1.62 1.3 1.62.67 0 1.31-.51 1.31-1.62 0-1.09-.64-1.6-1.31-1.6-.69 0-1.3.49-1.3 1.6zm6.6-2.74a2.04 2.04 0 0 1 2.13 1.72l-1.15.18c-.02-.6-.4-.82-.96-.82-.43 0-.76.19-.76.5 0 .24.16.48.66.56l.88.17a1.47 1.47 0 0 1 1.3 1.48 1.8 1.8 0 0 1-1.97 1.7 2.15 2.15 0 0 1-2.31-1.8l1.15-.18c.08.65.48.89 1.14.89.49 0 .82-.2.82-.5 0-.28-.16-.5-.7-.6l-.8-.14a1.54 1.54 0 0 1-1.37-1.5 1.8 1.8 0 0 1 1.93-1.68z"/></svg>

data/app/assets/images/payment_icons/visa.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 38 24" xmlns="http://www.w3.org/2000/svg" role="img" width="38" height="24" aria-labelledby="pi-visa"><title id="pi-visa">Visa</title><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path d="M28.3 10.1H28c-.4 1-.7 1.5-1 3h1.9c-.3-1.5-.3-2.2-.6-3zm2.9 5.9h-1.7c-.1 0-.1 0-.2-.1l-.2-.9-.1-.2h-2.4c-.1 0-.2 0-.2.2l-.3.9c0 .1-.1.1-.1.1h-2.1l.2-.5L27 8.7c0-.5.3-.7.8-.7h1.5c.1 0 .2 0 .2.2l1.4 6.5c.1.4.2.7.2 1.1.1.1.1.1.1.2zm-13.4-.3l.4-1.8c.1 0 .2.1.2.1.7.3 1.4.5 2.1.4.2 0 .5-.1.7-.2.5-.2.5-.7.1-1.1-.2-.2-.5-.3-.8-.5-.4-.2-.8-.4-1.1-.7-1.2-1-.8-2.4-.1-3.1.6-.4.9-.8 1.7-.8 1.2 0 2.5 0 3.1.2h.1c-.1.6-.2 1.1-.4 1.7-.5-.2-1-.4-1.5-.4-.3 0-.6 0-.9.1-.2 0-.3.1-.4.2-.2.2-.2.5 0 .7l.5.4c.4.2.8.4 1.1.6.5.3 1 .8 1.1 1.4.2.9-.1 1.7-.9 2.3-.5.4-.7.6-1.4.6-1.4 0-2.5.1-3.4-.2-.1.2-.1.2-.2.1zm-3.5.3c.1-.7.1-.7.2-1 .5-2.2 1-4.5 1.4-6.7.1-.2.1-.3.3-.3H18c-.2 1.2-.4 2.1-.7 3.2-.3 1.5-.6 3-1 4.5 0 .2-.1.2-.3.2M5 8.2c0-.1.2-.2.3-.2h3.4c.5 0 .9.3 1 .8l.9 4.4c0 .1 0 .1.1.2 0-.1.1-.1.1-.1l2.1-5.1c-.1-.1 0-.2.1-.2h2.1c0 .1 0 .1-.1.2l-3.1 7.3c-.1.2-.1.3-.2.4-.1.1-.3 0-.5 0H9.7c-.1 0-.2 0-.2-.2L7.9 9.5c-.2-.2-.5-.5-.9-.6-.6-.3-1.7-.5-1.9-.5L5 8.2z" fill="#142688"/></svg>

data/app/assets/images/payment_icons/volksbank.svg

@@ -0,0 +1 @@
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-volksbank"><title id="pi-volksbank">Volksbank</title><g clip-path="url(#clip0_39_168)"><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#fff"/><g clip-path="url(#clip1_39_168)"><path d="M5.91 3v18h26.18V3H5.91z" fill="#fff"/><path d="M21.852 17.146l-.562 2.959h10.049v-2.959h-9.487zm-15.4.027v2.959h9.977l-.666-2.959H6.451z" fill="#E05F0C"/><path d="M11.354 10.39l-.727-3.06h6.196l2.007 8.785h.086l1.264-5.628c.637-2.555.878-3.157 4.468-3.157h2.582s-.522 2.355-1.171 4.911c-.247.975-2.403.86-2.296-.051.012-.095.114-.78.194-1.268.118-.701-.7-.789-.847-.095-.104.498-.578 2.966-1.02 5.288h9.25V3.5H6.45v12.614h9.033l-1.287-5.72-2.842-.005z" fill="#0A438A"/></g></g><defs><clipPath id="pi-volksbank-clip0_39_168"><path fill="#fff" d="M0 0h38v24H0z"/></clipPath><clipPath id="pi-volksbank-clip1_39_168"><path fill="#fff" transform="translate(5.91 3)" d="M0 0h26.182v18H0z"/></clipPath></defs></svg>

data/app/assets/images/payment_icons/waavepaybybank.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-waavepaybybank" fill="none" xmlns="http://www.w3.org/2000/svg"><title id="pi-waavepaybybank">Waave Pay by Bank</title><g clip-path="url(#clip0_715_72196)"><path d="M2.84 1h32.328C36.176 1 37 1.824 37 2.836v18.328A1.838 1.838 0 0135.168 23H2.84a1.838 1.838 0 01-1.832-1.836V2.836C1.008 1.824 1.832 1 2.84 1z" fill="#7971ED" /><path d="M2.832 0H35.16c.781 0 1.492.32 2 .832v.004a2.83 2.83 0 01.832 2v18.328a2.83 2.83 0 01-.832 2v.004a2.816 2.816 0 01-2 .832H2.832c-.781 0-1.492-.32-2-.832v-.004a2.83 2.83 0 01-.832-2V2.836c0-.777.32-1.488.832-2V.832a2.816 2.816 0 012-.832zm0 1H35.16c1.008 0 1.832.824 1.832 1.836v18.328A1.838 1.838 0 0135.16 23H2.832A1.838 1.838 0 011 21.164V2.836C1 1.824 1.824 1 2.832 1z" fill="#000" fill-opacity=".071" /><path d="M31 6.014h-.8c-.33 0-.658.128-.915.34a1.363 1.363 0 00-.458.852 51.368 51.368 0 01-.457 2.85c-.8 4.299-1.244 5.93-2.716 5.93-.658 0-1.515-.355-1.987-2.61-.515-2.397-.743-3.872-1.344-5.135-.743-1.603-1.83-2.227-3.33-2.227-1.501 0-2.602.624-3.33 2.227-.587 1.263-.816 2.738-1.33 5.15C13.847 15.644 12.989 16 12.346 16c-1.472 0-1.915-1.631-2.716-5.93-.214-1.134-.329-1.97-.457-2.85-.043-.34-.2-.638-.458-.865A1.473 1.473 0 007.8 6H7l.043.397c.143 1.12.3 2.397.6 4.028.372 1.986.744 3.873 1.315 5.192.73 1.603 1.83 2.383 3.36 2.383 2.844 0 3.716-2.993 3.945-4.17.671-3.461 1.057-5.816 2.716-5.816 1.658 0 2.058 2.34 2.73 5.816.229 1.191 1.115 4.17 3.945 4.17 1.53 0 2.63-.794 3.36-2.383.6-1.32.942-3.192 1.314-5.192.315-1.645.472-2.907.6-4.028L30.971 6" fill="#fff" /></g><defs><clipPath id="pi-waavepaybybank-clip0_715_72196"><path fill="#fff" d="M0 0h38v24H0z" /></clipPath></defs></svg>

data/app/assets/images/payment_icons/walley.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-walley"><title id="pi-walley">Walley</title><path fill="#000" opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path d="M11.5 9.39v3.28L8.16 11a.51.51 0 00-.45 0l-3.34 1.67V9.39H1.76l1.55.9v3.28a.46.46 0 00.69.35l4-2 3.94 2a.46.46 0 00.69-.35V9.39zM19.34 11.71V14h-1.12v-.56a6.84 6.84 0 01-2.9.69c-1.36 0-2.11-.46-2.11-1.5s1.26-1.56 2.68-1.56a9.1 9.1 0 012.33.33c0-1-1.22-1.11-1.88-1.11a8 8 0 00-2.43.39l-.33-.84a9.78 9.78 0 012.9-.45c1.88 0 2.84.59 2.86 2.33zm-1.12 1v-.45a8.2 8.2 0 00-2.22-.35c-1 0-1.59.19-1.59.67s.48.63 1.27.63a8.7 8.7 0 002.55-.54zM20 8h1.11v6H20zM21.84 8H23v6h-1.16zM28.48 12.47h1.16c-.27 1-1.3 1.64-2.95 1.64-1.85 0-3.13-.76-3.13-2.36s1.33-2.35 3.06-2.35 3.08.67 3.08 2.6h-5c.11.85.8 1.19 2 1.19s1.56-.29 1.77-.72zm-3.69-1.26h3.69c-.2-.66-.83-1-1.86-1s-1.62.28-1.83 1z"/><path d="M35 9.4h1.26l-2.69 4.9C33 15.4 32.38 16 31.19 16a7.43 7.43 0 01-1.56-.18v-1a6.28 6.28 0 001.36.17c.67 0 1-.19 1.44-1v-.07h-.61L29.33 9.4h1.28l2.18 4z"/></svg>

data/app/assets/images/payment_icons/wbtc.svg

@@ -0,0 +1 @@
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-wbtc"><title id="pi-wbtc">Wrapped Bitcoin</title><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19 4c2.136 0 4.076.837 5.511 2.201A8 8 0 0119 20a8 8 0 010-16z" fill="#282A47"/><path d="M23.959 7.335l-.437.437a6.177 6.177 0 010 8.337l.437.436a6.801 6.801 0 000-9.22v.01zM14.782 7.373a6.178 6.178 0 018.337 0l.437-.436a6.801 6.801 0 00-9.22 0l.446.436zM14.373 16.113a6.177 6.177 0 010-8.333l-.436-.436a6.802 6.802 0 000 9.22l.436-.45zM23.113 16.516a6.177 6.177 0 01-8.337 0l-.436.437a6.801 6.801 0 009.22 0l-.447-.437z" fill="#54588C"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21.701 10.49c-.087-.91-.873-1.216-1.866-1.309V7.927h-.768v1.23h-.614v-1.23h-.762V9.19h-1.558v.822s.567-.01.559 0a.397.397 0 01.436.337v3.456a.269.269 0 01-.093.188.266.266 0 01-.198.067c.01.008-.558 0-.558 0l-.146.917h1.543v1.283h.768v-1.264h.614v1.258h.77v-1.268c1.297-.078 2.202-.398 2.315-1.613.092-.977-.368-1.414-1.102-1.59.446-.22.723-.627.66-1.293zm-1.076 2.732c0 .876-1.378.856-2.007.847l-.149-.002v-1.693l.192-.003c.646-.014 1.964-.043 1.964.85zM18.6 11.605c.527.009 1.667.03 1.667-.769 0-.818-1.104-.789-1.641-.775l-.156.003v1.539c.037 0 .08 0 .13.002z" fill="#fff"/></svg>

data/app/assets/images/payment_icons/wechatpay.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-wechatpay"><title id="pi-wechatpay">WeChat Pay</title><path fill="#000" opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path fill="#39B54A" d="M17.1,9.6c-0.1,0-0.1,0-0.2,0.1c-0.2,0-0.3-0.1-0.4-0.2V9.3l-1.3-2.8c0,0,0-0.1,0-0.1c0-0.1,0.1-0.2,0.2-0.2c0.1,0,0.1,0,0.1,0.1L17,7.3c0.1,0.1,0.2,0.1,0.4,0.1c0.1,0,0.2,0,0.2,0l7.1-3.2c-1.5-1.6-3.5-2.5-5.7-2.5c-3.9,0-7,2.6-7,5.9c0,1.8,0.9,3.4,2.4,4.4c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c-0.1,0.4-0.3,1.1-0.3,1.2c0,0.1,0,0.1,0,0.2c0,0.1,0.1,0.2,0.2,0.2c0,0,0.1,0,0.1,0l1.5-0.9c0.1-0.1,0.2-0.1,0.4-0.1c0.1,0,0.1,0,0.2,0c0.7,0.2,1.5,0.3,2.3,0.3c3.9,0,7-2.6,7-5.9c0-0.9-0.3-1.8-0.8-2.6L17.1,9.6L17.1,9.6z"/><path fill="#505052" d="M10.5,19.8L10.4,20c-0.1,0.2-0.1,0.4-0.2,0.6c-0.1-0.3-0.1-0.6-0.2-0.9l-0.5-1.8l0,0H9.2l-0.6,1.9c-0.1,0.3-0.2,0.6-0.2,0.9L8.3,20l-0.5-2.1l0,0H7.4l0.9,3.4l0,0h0.3l0.6-1.9c0.1-0.3,0.2-0.6,0.2-0.8c0,0.2,0.1,0.5,0.2,0.8l0.5,1.9l0,0h0.3l1-3.3l0,0h-0.4L10.5,19.8z"/><path fill="#505052" d="M12.6,18.8c-0.7,0-1.1,0.5-1.1,1.3c-0.1,0.6,0.4,1.2,1,1.2c0,0,0.1,0,0.1,0c0.3,0,0.5,0,0.8-0.2h0.1l-0.2-0.2l0,0C13.1,21,12.9,21,12.7,21c-0.5,0-0.8-0.3-0.8-0.9h1.7v0c0,0,0-0.1,0-0.1c0-0.2-0.1-0.5-0.2-0.7C13.2,19,12.9,18.8,12.6,18.8 M11.8,19.8c0-0.4,0.3-0.7,0.7-0.7c0.2,0,0.3,0,0.4,0.2c0.1,0.1,0.2,0.3,0.2,0.5H11.8z"/><path fill="#505052" d="M16.3,20.9L16.3,20.9c-0.2,0.1-0.5,0.1-0.7,0.1c-0.7,0-1.3-0.5-1.3-1.1c0-0.1,0-0.2,0-0.2c-0.1-0.7,0.4-1.4,1.1-1.4c0.1,0,0.2,0,0.2,0c0.2,0,0.4,0,0.6,0.1l0,0l0.2-0.3l0,0c-0.2-0.1-0.5-0.2-0.8-0.2c-0.9,0-1.7,0.7-1.7,1.6c0,0.1,0,0.1,0,0.2c-0.1,0.9,0.5,1.6,1.4,1.7c0.1,0,0.1,0,0.2,0c0.3,0,0.6-0.1,0.9-0.2l0,0L16.3,20.9L16.3,20.9z"/><path fill="#505052" d="M18,18.8c-0.2,0-0.4,0.1-0.5,0.1c-0.1,0.1-0.2,0.1-0.2,0.2v-1.3h-0.4v3.5h0.3v-1.5c0-0.1,0-0.1,0-0.2c0.1-0.3,0.3-0.5,0.6-0.5c0.5,0,0.6,0.5,0.6,0.7v1.4h0.4v-1.5C18.8,18.8,18.1,18.8,18,18.8"/><path fill="#505052" d="M22.1,18.3h-0.4v0.5h-0.4v0.3h0.4v1.4c0,0.2,0,0.4,0.2,0.6c0.1,0.1,0.3,0.2,0.4,0.2c0.1,0,0.2,0,0.4-0.1h0.1L22.6,21l0,0h-0.2c-0.2,0-0.3-0.1-0.3-0.4v-1.5h0.7v-0.3h-0.7L22.1,18.3z"/><path fill="#505052" d="M25.1,17.9c-0.2,0-0.5,0-0.7,0.1l0,0v3.3h0.4v-1.4c0.1,0,0.2,0,0.3,0c0.4,0,0.7-0.1,1-0.4c0.2-0.2,0.3-0.4,0.2-0.7c0-0.3-0.1-0.5-0.3-0.7C25.8,18,25.5,17.8,25.1,17.9 M24.7,18.2c0.1,0,0.3,0,0.4,0c0.5,0,0.8,0.2,0.8,0.7s-0.3,0.7-0.9,0.7c-0.1,0-0.2,0-0.4,0L24.7,18.2z"/><path fill="#505052" d="M30.2,18.8l-0.6,1.5c0,0.1-0.1,0.2-0.1,0.4l-0.1-0.3l-0.6-1.5l0,0h-0.4l0.9,2.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0.1c-0.1,0.2-0.2,0.4-0.4,0.6c-0.1,0.1-0.2,0.2-0.4,0.2h-0.1l0.3,0.3l0,0c0.1-0.1,0.2-0.2,0.3-0.2c0.4-0.4,0.6-0.9,0.8-1.4l0.7-1.8v-0.1L30.2,18.8z"/><path fill="#505052" d="M21,20.7v-0.9c0-0.6-0.3-1-0.9-1c-0.3,0-0.5,0.1-0.7,0.2l0,0l0.2,0.3l0,0c0.2-0.1,0.3-0.2,0.5-0.2l0,0c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.2,0.3,0.1,0.5c-0.4,0-0.9,0.1-1.2,0.4c-0.2,0.1-0.2,0.3-0.2,0.6c0,0.4,0.3,0.7,0.7,0.7c0,0,0,0,0.1,0c0.3,0,0.5-0.1,0.7-0.3v0.2h0.4v-0.1C21,21,21,20.8,21,20.7 M19.8,20.3c0.3-0.2,0.6-0.3,0.9-0.2l0,0v0.4c0,0,0,0.1,0,0.1C20.6,20.9,20.3,21,20,21c-0.2,0-0.4-0.2-0.4-0.4c0,0,0,0,0-0.1C19.6,20.5,19.7,20.3,19.8,20.3"/><path fill="#505052" d="M28.1,20.7v-0.9c0-0.6-0.3-1-0.9-1c-0.2,0-0.5,0.1-0.7,0.2l0,0l0.2,0.3l0,0c0.2-0.1,0.3-0.1,0.5-0.1l0,0c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.2,0.3,0.2,0.5c-0.4,0-0.9,0.1-1.2,0.4c-0.1,0.1-0.2,0.4-0.2,0.6c0,0.4,0.3,0.7,0.7,0.7c0,0,0,0,0.1,0c0.3,0,0.5-0.1,0.7-0.3v0.2h0.4v-0.1C28.2,21,28.2,20.8,28.1,20.7 M27.9,20.5c0,0,0,0.1,0,0.1c-0.1,0.3-0.4,0.4-0.6,0.4c-0.2,0-0.4-0.1-0.4-0.4c0,0,0,0,0-0.1c0-0.1,0-0.2,0.1-0.3c0.3-0.2,0.6-0.3,0.9-0.2h0L27.9,20.5z"/></svg>

data/app/assets/images/payment_icons/whishcheckout.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-whishcheckout"><title id="pi-whishcheckout">Whish Checkout</title><path fill="#000" opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path fill="#e81c48" d="M16.638 7.92h18.896v6.458c-.258.877-.863 1.481-1.759 1.702H18.447c-1.05-.256-1.73-1.046-1.811-2.126l.002-6.034zm3.203 3.016c-1.479.238-1.071 3.067.556 1.866-.233-.49-.225-.252-.516-.222-.712.074-.325-1.308.189-1.147.076.023.12.148.202.135.049-.007.317-.219.328-.276.056-.296-.54-.391-.759-.356zm5.901.63c.08.036.619-.249.241-.515-.578-.406-1.4.178-1.492.812-.103.706.131 1.342.964 1.21.166-.026.522-.181.435-.374-.156-.347-.235-.155-.435-.125-.786.118-.383-1.362.218-1.116.061.025.062.105.07.108zm3.247-.63c-1.081.146-1.306 2.05-.214 2.14 1.39.117 1.674-2.335.214-2.14zm-7.426.038c-.095.017-.522-.025-.55.002-.076.073-.287 1.803-.405 2.05.13-.023.465.044.556-.021.091-.066.105-.77.177-.783l.523.004-.15.8.558-.029.397-2.023c-.102.02-.506-.031-.548.005-.046.039-.082.615-.15.717-.049.073-.444.007-.559.028l.151-.75zm2.814 0h-1.306l-.402 2.052h1.357c.022 0 .043-.404.05-.45h-.754c.042-.576.358-.253.672-.358.116-.039.092-.37.132-.493h-.603c-.163-.524.712-.206.804-.301.015-.016.03-.377.05-.45zm2.714 0h-.552l-.403 2.052c.13-.023.466.044.557-.021.097-.07.031-.697.373-.73.043 0 .202.72.231.746.043.037.492-.015.598.005l-.435-1.177.737-.875c-.164.028-.526-.052-.653.025-.133.08-.365.541-.553.626l.1-.651zm3.92 0c-.117.024-.476-.038-.546.006-.055.035-.251 1.135-.258 1.272-.027.614.314.9.926.82.859-.113.74-1.464.983-2.074-.109-.014-.466-.068-.545-.018-.06.038-.216 1.17-.306 1.373-.08.184-.311.34-.46.152-.162-.205.206-1.23.206-1.53zm2.915 0h-1.533c-.073 0-.115.368-.125.45l.503.026-.303 1.576c.146-.026.4.037.523.003.098-.027.275-1.545.334-1.602.033-.032.524.024.55-.003.016-.016.03-.377.051-.45z"/><path fill="#e81c48" d="M15.934 7.92l.001 6.232c.085.762.449 1.372.954 1.928H2.466V9.672c.243-.908.894-1.527 1.809-1.752h11.66zm-5.653 2.303H7.994l.063.112 1.244.388H5.557c-.031 0-.097.104-.076.15l3.77.501H4.425c-.038.175.248.081.335.142l4.64.71H6.587l.128.147 3.138.603H8.094c-.018.108.048.12.127.15.496.192 2.088.572 2.625.638.234.029.463.053.609-.169.204-.31.322-.932.507-1.296.024-.048.032-.12.102-.124.07.055.41 1.273.603 1.478.098.103.189.12.326.128.401.021.427-.122.567-.441.266-.602.618-1.629.792-2.266.111-.41.087-.855-.453-.856-.571-.001-.67 1.113-.855 1.557-.02.048-.005.114-.074.1-.104-.318-.444-1.554-.74-1.642-.782-.23-.884 1.01-1.118 1.519-.023.05-.031.117-.102.123-.12-.34-.36-1.573-.73-1.652zM28.711 12.514c-.121-.121-.063-.59.002-.751.094-.237.425-.513.6-.225.283.464-.256 1.318-.602.976z"/></svg>

data/app/assets/images/payment_icons/wingbank.svg

@@ -0,0 +1 @@
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" role="img" aria-labelledby="pi-wingbank"><title id="pi-wingbank">Wing Bank</title><rect x="1" y="1" width="36" height="22" rx="2" fill="#AAD039"/><rect x=".5" y=".5" width="37" height="23" rx="2.5" stroke="#000" stroke-width="1" stroke-opacity=".07"/><path d="M4.085 13.86l1.797-4.547h.598l-.098 1.011L4.484 15h-.637l.238-1.14zm.016-4.547l.188 4.628L4.136 15h-.695l-.36-5.688h1.02zm2.86 4.515l1.585-4.515h1.067L7.473 15H6.78l.18-1.172zm-.192-4.515l.383 4.664L7.066 15h-.633L6 10.234l.171-.921h.598zm3.717 1.46L9.756 15H8.744l.735-4.227h1.007zm-.882-1.085a.507.507 0 01.16-.399.595.595 0 01.41-.16.575.575 0 01.398.14.468.468 0 01.172.383.497.497 0 01-.164.395.599.599 0 01-.406.156.584.584 0 01-.399-.137.48.48 0 01-.171-.379zm2.096 2.046L11.133 15h-1.011l.734-4.227h.945l-.101.961zm-.324 1l-.278.004c.031-.252.091-.501.18-.746.088-.247.208-.47.36-.668a1.7 1.7 0 01.558-.469c.219-.114.473-.169.762-.164.231.008.423.056.574.145a.933.933 0 01.355.355c.084.146.137.314.16.504.026.19.028.388.004.594L13.602 15h-1.015l.457-2.723c.015-.145.01-.276-.016-.39a.441.441 0 00-.16-.27c-.084-.068-.206-.103-.367-.105a.881.881 0 00-.454.097c-.13.07-.24.166-.332.286-.09.12-.164.253-.218.402a2.494 2.494 0 00-.121.437zm5.877-1.96h.926l-.7 4.093c-.051.38-.178.706-.378.977-.198.273-.452.48-.762.62a2.297 2.297 0 01-1.586.114 1.862 1.862 0 01-.512-.234 1.637 1.637 0 01-.406-.375l.512-.598c.117.156.255.279.414.367.159.089.336.136.531.14.211.006.397-.032.559-.112a1.04 1.04 0 00.402-.348c.104-.151.175-.33.211-.535l.543-3.195.246-.915zm-3.137 2.19l.012-.081c.031-.266.094-.529.188-.79.093-.262.218-.5.375-.714a1.77 1.77 0 01.582-.508 1.56 1.56 0 01.8-.176c.28.008.506.077.68.207.177.128.313.296.406.504.097.206.16.43.192.672.034.24.044.477.031.711l-.023.223c-.045.24-.116.483-.215.73a2.82 2.82 0 01-.38.676c-.153.206-.338.37-.554.492a1.39 1.39 0 01-.738.172c-.281-.008-.516-.077-.703-.207-.185-.13-.33-.3-.434-.508a2.175 2.175 0 01-.207-.68 3.207 3.207 0 01-.012-.722zm1.024-.085l-.012.086a3.45 3.45 0 00-.015.41c.005.146.028.285.07.418a.74.74 0 00.203.328.601.601 0 00.395.137.903.903 0 00.539-.13c.156-.098.283-.228.382-.39.1-.161.168-.336.207-.523l.09-.617c.01-.128.007-.256-.011-.383a1.01 1.01 0 00-.114-.348.671.671 0 00-.605-.352.822.822 0 00-.477.114 1.104 1.104 0 00-.336.332 1.829 1.829 0 00-.21.45 2.51 2.51 0 00-.106.468z" fill="#fff"/><path d="M21.871 12.465h-1.464l.128-.758 1.153.004c.18 0 .35-.026.512-.078.164-.055.3-.14.41-.258a.833.833 0 00.21-.469c.024-.18.007-.323-.05-.43a.489.489 0 00-.274-.234 1.328 1.328 0 00-.433-.078l-.906-.004-.84 4.84h-1.051l.984-5.688 1.844.004c.242.003.474.033.695.09.224.055.42.14.59.258.172.117.304.272.395.465.093.19.13.423.11.7-.02.299-.108.546-.267.741a1.481 1.481 0 01-.601.446c-.242.101-.5.161-.773.18l-.372.269zM21.4 15h-1.762l.582-.844 1.215.004a1.41 1.41 0 00.508-.098.92.92 0 00.598-.762.917.917 0 00-.028-.429.51.51 0 00-.219-.285.795.795 0 00-.414-.117l-1.14-.004.136-.758 1.34.004.184.289c.247.02.462.086.644.195.185.11.323.258.414.446.094.187.133.409.117.664-.028.4-.147.726-.355.976-.206.25-.469.434-.789.551-.32.115-.664.17-1.031.168zm4.588-.898l.309-1.965a.806.806 0 00-.024-.34.46.46 0 00-.164-.25.54.54 0 00-.328-.098.815.815 0 00-.34.063.697.697 0 00-.258.191.691.691 0 00-.144.305l-1.008.008a1.14 1.14 0 01.2-.594 1.4 1.4 0 01.445-.414 2.258 2.258 0 011.206-.312c.29.005.548.066.774.183.227.117.4.284.52.5.12.213.164.474.133.781l-.301 1.844c-.024.15-.04.307-.051.469-.01.159.01.31.062.457l-.003.07-.997.004a1.54 1.54 0 01-.066-.45 3.74 3.74 0 01.035-.452zm.426-1.676l-.102.613-.582-.004c-.12 0-.24.013-.363.04a1.24 1.24 0 00-.336.124.77.77 0 00-.262.223.694.694 0 00-.128.344.492.492 0 00.035.273.44.44 0 00.164.188.553.553 0 00.27.07 1.041 1.041 0 00.78-.332.85.85 0 00.215-.371l.239.453a1.596 1.596 0 01-.235.422 1.664 1.664 0 01-.343.332 1.586 1.586 0 01-.903.285 1.417 1.417 0 01-.644-.164 1.18 1.18 0 01-.457-.434 1.116 1.116 0 01-.153-.64 1.3 1.3 0 01.207-.688 1.38 1.38 0 01.492-.437c.201-.107.42-.184.657-.23.24-.048.475-.071.707-.071l.742.004zm2.315-.692L28.162 15H27.15l.734-4.227h.945l-.101.961zm-.324 1l-.278.004c.032-.252.091-.501.18-.746.089-.247.208-.47.36-.668a1.7 1.7 0 01.558-.469c.219-.114.473-.169.762-.164a1.2 1.2 0 01.574.145.934.934 0 01.356.355c.083.146.136.314.16.504.026.19.027.388.003.594L30.63 15h-1.015l.457-2.723c.015-.145.01-.276-.016-.39a.44.44 0 00-.16-.27c-.083-.068-.206-.103-.367-.105a.881.881 0 00-.453.097c-.13.07-.241.166-.332.286-.092.12-.165.253-.22.402a2.503 2.503 0 00-.12.437zM33 8.996L31.957 15h-1.012l1.043-6.004H33zm2.297 1.777l-2.137 2.059-1.172 1.04-.191-.872.89-.938 1.317-1.289h1.293zM33.527 15l-.949-2.012.742-.633L34.637 15h-1.11z" fill="#0C6DB6"/></svg>

data/app/assets/images/payment_icons/xrp.svg

@@ -0,0 +1 @@
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-xrp"><title id="pi-xrp">XRP</title><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#fff"/><circle cx="19" cy="12" r="8" fill="#000"/><mask id="pi-mask0_3_355" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="11" y="4" width="16" height="16"><circle cx="19" cy="12" r="8" fill="#fff"/></mask><g mask="url(#mask0_3_355)"><path fill-rule="evenodd" clip-rule="evenodd" d="M22.773 8.632h-1.095l-1.733 1.796a1.305 1.305 0 01-1.893 0L16.32 8.632h-1.095l2.28 2.364a2.06 2.06 0 002.988 0l2.28-2.364zm-7.563 6.576h1.096l1.75-1.812a1.305 1.305 0 011.892 0l1.746 1.812h1.096l-2.295-2.38a2.061 2.061 0 00-2.99 0l-2.294 2.38z" fill="#fff"/></g></svg>

data/app/assets/images/payment_icons/zip.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-zip"><title id="pi-zip">Zip</title><path d="M34.9 23H3.1c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h31.8c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2z" fill="#fff"/><path fill="#1a0826" d="M6.5 14.7l.2 1.9h8l-.2-2.2h-3.8v-.2l3.4-2.4-.2-1.9h-8l.3 2.1h3.7v.3z"/><path fill="#aa8fff" d="M14.8 9.9l.9 6.7h8l-.8-6.7z"/><path d="M32.1 12.3c-.2-1.5-1.4-2.4-3-2.4h-5.3l.8 6.7H27l-.2-1.3h2.5c2.1-.1 3-1.3 2.8-3zm-3 1.1h-2.5l-.2-1.6h2.5c.6 0 .9.3.9.8.1.2 0 .8-.7.8z" fill="#1a0826"/><ellipse transform="rotate(-46.771 16.352 8.156)" cx="16.4" cy="8.2" rx="1.1" ry="1.3" fill="#1a0826"/><path d="M34.9 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3.1c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h31.8m0-1H3.1c-1.7 0-3 1.3-3 3v18c0 1.7 1.3 3 3 3h31.8c1.7 0 3-1.3 3-3V3c0-1.6-1.3-3-3-3z" opacity=".07"/></svg>

data/app/finders/spree/posts/find.rb

@@ -0,0 +1,137 @@
+module Spree
+  module Posts
+    class Find < Spree::BaseFinder
+      def initialize(scope:, params:)
+        super(scope: scope, params: params)
+        @scope = scope
+        @query = params[:q].presence&.strip
+        @ids = String(params.dig(:filter, :ids)).split(',')
+        @slugs = String(params.dig(:filter, :slugs)).split(',')
+        @category_ids = String(params.dig(:filter, :category_ids)).split(',')
+        @author_ids = String(params.dig(:filter, :author_ids)).split(',')
+        @tags = params.dig(:filter, :tags).to_s.split(',').compact_blank
+        @sort_by = params[:sort_by]
+        @published = params.dig(:filter, :published)
+      end
+
+      def execute
+        posts = by_ids(scope)
+        posts = by_slugs(posts)
+        posts = by_query(posts)
+        posts = by_category_ids(posts)
+        posts = by_author_ids(posts)
+        posts = by_tags(posts)
+        posts = by_published(posts)
+        posts = ordered(posts)
+
+        posts.distinct
+      end
+
+      private
+
+      attr_reader :scope, :query, :ids, :slugs, :category_ids, :author_ids, :tags, :sort_by, :published
+
+      def query?
+        query.present?
+      end
+
+      def ids?
+        ids.present?
+      end
+
+      def slugs?
+        slugs.present?
+      end
+
+      def category_ids?
+        category_ids.present?
+      end
+
+      def author_ids?
+        author_ids.present?
+      end
+
+      def tags?
+        tags.present?
+      end
+
+      def published?
+        published.present?
+      end
+
+      def sort_by?
+        sort_by.present?
+      end
+
+      def by_query(posts)
+        return posts unless query?
+
+        posts.search_by_title(query)
+      end
+
+      def by_ids(posts)
+        return posts unless ids?
+
+        posts.where(id: ids)
+      end
+
+      def by_slugs(posts)
+        return posts unless slugs?
+
+        posts.where(slug: slugs)
+      end
+
+      def by_category_ids(posts)
+        return posts unless category_ids?
+
+        posts.where(post_category_id: category_ids)
+      end
+
+      def by_author_ids(posts)
+        return posts unless author_ids?
+
+        posts.where(author_id: author_ids)
+      end
+
+      def by_tags(posts)
+        return posts if tags.empty?
+
+        posts.tagged_with(tags, any: true)
+      end
+
+      def by_published(posts)
+        return posts unless published?
+
+        case published.to_s
+        when 'true'
+          posts.published
+        when 'false'
+          posts.where(published_at: nil)
+        else
+          posts
+        end
+      end
+
+      def ordered(posts)
+        return posts unless sort_by?
+
+        case sort_by
+        when 'newest-first'
+          posts.by_newest
+        when 'oldest-first'
+          posts.order(created_at: :asc)
+        when 'published-newest'
+          posts.order(published_at: :desc)
+        when 'published-oldest'
+          posts.order(published_at: :asc)
+        when 'title-a-z'
+          posts.order(title: :asc)
+        when 'title-z-a'
+          posts.order(title: :desc)
+        else
+          posts
+        end
+      end
+    end
+  end
+end

data/app/helpers/spree/addresses_helper.rb

@@ -67,16 +67,22 @@ module Spree
     end
 
     def current_store_countries_with_states_ids
-      @current_store_countries_with_states_ids ||= current_store.countries_available_for_checkout.where(states_required: true).includes(:states).each_with_object([]) do |country, memo|
+      Spree::Deprecation.warn('current_store_countries_with_states_ids is deprecated and will be removed in Spree 5.3')
+
+      @current_store_countries_with_states_ids ||= current_store.countries_available_for_checkout.find_all { |country| country.states_required? }.each_with_object([]) do |country, memo|
         memo << current_store.states_available_for_checkout(country)
       end.flatten.pluck(:country_id)
     end
 
     def current_store_countries_without_states_ids
-      @current_store_countries_without_states_ids ||= current_store.countries_available_for_checkout.where(states_required: false).ids
+      Spree::Deprecation.warn('current_store_countries_without_states_ids is deprecated and will be removed in Spree 5.3')
+
+      @current_store_countries_without_states_ids ||= current_store.countries_available_for_checkout.find_all { |country| !country.states_required? }.pluck(:id)
     end
 
     def current_store_supported_countries_ids
+      Spree::Deprecation.warn('current_store_supported_countries_ids is deprecated and will be removed in Spree 5.3')
+
       @current_store_supported_countries_ids ||= Rails.cache.fetch(['current_store_supported_countries_ids', current_store]) do
         (current_store_countries_with_states_ids + current_store_countries_without_states_ids).uniq
       end
@@ -90,7 +96,7 @@ module Spree
           addresses.
           includes(:country, :state).
           not_quick_checkout.
-          where(country_id: current_store_supported_countries_ids).
+          where(country_id: current_store.countries_available_for_checkout.pluck(:id)).
           includes(:user)
       end
     end

data/app/helpers/spree/base_helper.rb

@@ -203,7 +203,7 @@ module Spree
         "#{base_url + localize}/posts/#{resource.slug}#{preview_id}"
       elsif resource.is_a?(Spree::Taxon)
         "#{base_url + localize}/t/#{resource.permalink}"
-      elsif resource.is_a?(Spree::Page) || resource.is_a?(ActionText::RichText)
+      elsif resource.is_a?(Spree::Page) || resource.is_a?(Spree::Policy)
         "#{base_url + localize}#{resource.page_builder_url}"
       elsif resource.is_a?(Spree::PageLink)
         resource.linkable_url
@@ -238,7 +238,7 @@ module Spree
         I18n.locale,
         (current_currency if defined?(current_currency)),
         defined?(try_spree_current_user) && try_spree_current_user.present?,
-        defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')
+        defined?(try_spree_current_user) && try_spree_current_user.respond_to?(:role_users) && try_spree_current_user.role_users.cache_key_with_version
       ].compact
     end
 
@@ -251,8 +251,12 @@ module Spree
     end
 
     def payment_method_icon_tag(payment_method, opts = {})
-      image_tag "payment_icons/#{payment_method}.svg", opts
-    rescue Sprockets::Rails::Helper::AssetNotFound
+      return '' unless defined?(inline_svg)
+
+      opts[:width] ||= opts[:height] * 1.5 if opts[:height]
+      opts[:size] = "#{opts[:width]}x#{opts[:height]}" if opts[:width] && opts[:height]
+
+      inline_svg "payment_icons/#{payment_method}.svg", opts
     end
 
     private

data/app/jobs/spree/images/save_from_url_job.rb

@@ -0,0 +1,70 @@
+require 'open-uri'
+
+module Spree
+  module Images
+    class SaveFromUrlJob < ::Spree::BaseJob
+      queue_as Spree.queues.images
+      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: 2
+      discard_on URI::InvalidURIError
+
+      def perform(viewable_id, viewable_type, external_url, external_id = nil, position = nil)
+        viewable = viewable_type.safe_constantize.find(viewable_id)
+
+        Spree::Image.ensure_metafield_definition_exists!(Spree::Image::EXTERNAL_URL_METAFIELD_KEY)
+
+        external_url = external_url.downcase.strip
+        external_id = external_id.to_s.downcase.strip if external_id.present?
+
+        image = find_or_initialize_image(viewable, external_url, external_id)
+
+        image.set_default_values_for_import if image.new_record? && image.respond_to?(:set_default_values_for_import)
+
+        return if image.skip_import?
+
+        image.restore if image.respond_to?(:deleted?) && image.deleted?
+        image.position = position if position.present?
+
+        # don't re-download the image if it's already been downloaded
+        # still trigger save! if position has changed
+        image.save! and return if image_already_saved?(image, external_url)
+
+        uri = URI.parse(external_url)
+        unless %w[http https].include?(uri.scheme)
+          raise URI::InvalidURIError, "Invalid URL scheme: #{uri.scheme}. Only http and https are allowed."
+        end
+
+        file = uri.open
+        filename = File.basename(uri.path)
+
+        image.attachment.attach(io: file, filename: filename)
+        image.external_url = external_url
+        image.external_id = external_id if external_id.present? && image.respond_to?(:external_id)
+        image.save!
+      rescue ActiveStorage::IntegrityError => e
+        raise e unless Rails.env.test?
+      end
+
+      private
+
+      def image_already_saved?(image, external_url)
+        image.persisted? && image.attachment.attached? && image.external_url.present? && external_url == image.external_url
+      end
+
+      def image_scope(viewable)
+        if Spree::Image.respond_to?(:with_deleted)
+          viewable.images.with_deleted
+        else
+          viewable.images
+        end
+      end
+
+      def find_or_initialize_image(viewable, external_url, external_id = nil)
+        if external_id.present? && viewable.respond_to?(:external_id)
+          image_scope(viewable).find_or_initialize_by(external_id: external_id)
+        else
+          image_scope(viewable).with_external_url(external_url).first || viewable.images.new
+        end
+      end
+    end
+  end
+end

data/app/jobs/spree/imports/create_rows_job.rb

@@ -0,0 +1,72 @@
+module Spree
+  module Imports
+    class CreateRowsJob < Spree::BaseJob
+      queue_as Spree.queues.imports
+
+      discard_on ::CSV::MalformedCSVError, EncodingError do |job, error|
+        import = Spree::Import.find(job.arguments.first)
+        import.update_columns(processing_errors: error.message, status: :failed, updated_at: Time.current)
+        Rails.error.report error
+      end
+
+      BATCH_SIZE = 1000
+
+      def perform(import_id)
+        import = Spree::Import.find(import_id)
+        import.start_processing! if import.status != 'processing'
+
+        create_rows_sequentially(import)
+
+        # enqueue processing rows job after creating rows in a separate job
+        import.process_rows_async
+      end
+
+      private
+
+      def create_rows_sequentially(import)
+        rows_to_insert = []
+        row_number = 1
+
+        created_at = updated_at = Time.current
+
+        upsert_options = {}
+        if %w[PostgreSQL SQLite].include?(ActiveRecord::Base.connection.adapter_name)
+          upsert_options[:unique_by] = %i[import_id row_number]
+        end
+        # NOTE: Ensure a DB-level unique index on [:import_id, :row_number] for all adapters.
+
+        # Stream CSV to avoid loading entire file in memory
+        # This maintains order by processing sequentially
+        ::CSV.foreach(StringIO.new(import.attachment_file_content),
+                   headers: true,
+                   col_sep: import.preferred_delimiter,
+                   encoding: 'UTF-8') do |csv_row|
+
+          rows_to_insert << {
+            import_id: import.id,
+            row_number: row_number,
+            data: csv_row.to_h.to_json,
+            status: 'pending',
+            created_at: created_at,
+            updated_at: updated_at
+          }
+
+          row_number += 1
+
+          # Bulk upsert when we reach batch size
+          if rows_to_insert.size >= BATCH_SIZE
+            Spree::ImportRow.upsert_all(rows_to_insert, **upsert_options)
+            rows_to_insert.clear
+          end
+        end
+
+        # Upsert any remaining rows
+        if rows_to_insert.any?
+          Spree::ImportRow.upsert_all(rows_to_insert, **upsert_options)
+        end
+
+        Spree::Import.reset_counters(import.id, :rows)
+      end
+    end
+  end
+end

data/app/jobs/spree/imports/process_rows_job.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Imports
+    class ProcessRowsJob < Spree::BaseJob
+      queue_as Spree.queues.imports
+
+      def perform(import_id)
+        import = Spree::Import.find(import_id)
+
+        # process all rows in sequential order
+        import.rows.pending_and_failed.find_each(batch_size: 100) do |row|
+          row.process!
+        end
+
+        # mark as complete
+        import.complete!
+      end
+    end
+  end
+end

data/app/models/concerns/spree/adjustment_source.rb

@@ -14,12 +14,12 @@ module Spree
 
       return if amount.zero?
 
-      adjustments.new(
-        adjustable: adjustable,
+      adjustable.adjustments.new(
         amount: amount,
         included: included,
         label: label,
-        order: order
+        order: order,
+        source: self
       ).save
     end
 

data/app/models/concerns/spree/admin_user_methods.rb

@@ -0,0 +1,52 @@
+module Spree
+  module AdminUserMethods
+    extend ActiveSupport::Concern
+
+    included do
+      # Associations
+      has_many :canceled_orders, class_name: 'Spree::Order', foreign_key: :canceler_id
+      has_many :created_orders, class_name: 'Spree::Order', foreign_key: :created_by_id
+      has_many :approved_orders, class_name: 'Spree::Order', foreign_key: :approver_id
+      has_many :created_gift_cards, class_name: 'Spree::GiftCard', foreign_key: :created_by_id
+      has_many :created_gift_card_batches, class_name: 'Spree::GiftCardBatch', foreign_key: :created_by_id
+      has_many :refunded_refunds, class_name: 'Spree::Refund', foreign_key: :refunder_id
+      has_many :performed_reimbursements, class_name: 'Spree::Reimbursement', foreign_key: :performed_by_id
+      has_many :authored_posts, class_name: 'Spree::Post', foreign_key: :author_id
+      has_many :created_store_credits, class_name: 'Spree::StoreCredit', foreign_key: :created_by_id
+      has_many :reports, class_name: 'Spree::Report', foreign_key: :user_id
+      has_many :exports, class_name: 'Spree::Export', foreign_key: :user_id
+
+      # Callbacks
+      after_destroy :nullify_approver_id_in_approved_orders
+      after_destroy :cleanup_admin_user_resources
+    end
+
+    private
+
+    def nullify_approver_id_in_approved_orders
+      return if self.class != Spree.admin_user_class
+
+      approved_orders.update_all(approver_id: nil, updated_at: Time.current)
+    end
+
+    def cleanup_admin_user_resources
+      return if self.class != Spree.admin_user_class
+
+      # resources to nullify
+      # TODO: we should change these associations to polymorphic and resolve this via standard rails association
+      # declarations with dependent: :nullify
+      canceled_orders.update_all(canceler_id: nil, updated_at: Time.current)
+      created_orders.update_all(created_by_id: nil, updated_at: Time.current)
+      created_gift_cards.update_all(created_by_id: nil, updated_at: Time.current)
+      created_gift_card_batches.update_all(created_by_id: nil, updated_at: Time.current)
+      refunded_refunds.update_all(refunder_id: nil, updated_at: Time.current)
+      performed_reimbursements.update_all(performed_by_id: nil, updated_at: Time.current)
+      authored_posts.update_all(author_id: nil, updated_at: Time.current)
+      created_store_credits.update_all(created_by_id: nil, updated_at: Time.current)
+
+      # resources to destroy
+      reports.destroy_all
+      exports.destroy_all
+    end
+  end
+end

data/app/models/concerns/spree/display_on.rb

@@ -2,12 +2,18 @@ module Spree
   module DisplayOn
     extend ActiveSupport::Concern
 
-    DISPLAY = [:both, :front_end, :back_end].freeze
+    DISPLAY = [:both, :front_end, :back_end]
 
     included do
       scope :available,              -> { where(display_on: [:both]) }
       scope :available_on_front_end, -> { where(display_on: [:front_end, :both]) }
       scope :available_on_back_end,  -> { where(display_on: [:back_end, :both]) }
+
+      validates :display_on, presence: true, inclusion: { in: DISPLAY.map(&:to_s) }
+
+      def available_on_front_end?
+        display_on == 'front_end' || display_on == 'both'
+      end
     end
   end
 end

data/app/models/concerns/spree/has_image_alt_text.rb

@@ -0,0 +1,18 @@
+module Spree
+  module HasImageAltText
+    extend ActiveSupport::Concern
+
+    # @return [String] Alt text resolved from preference, asset filename, or i18n fallback.
+    def image_alt
+      return preferred_image_alt if respond_to?(:preferred_image_alt) && preferred_image_alt.present?
+
+      if respond_to?(:asset) && asset&.filename.present?
+        filename = asset.filename.to_s
+        base = File.basename(filename, File.extname(filename))
+        return base.tr('-_.', ' ').squeeze(' ').strip
+      end
+
+      Spree.t(:image, default: 'Image')
+    end
+  end
+end

data/app/models/concerns/spree/has_one_link.rb

@@ -12,7 +12,7 @@ module Spree
           [Spree.t(:product), 'Spree::Product'],
           [Spree.t(:post), 'Spree::Post'],
           [Spree.t(:taxon), 'Spree::Taxon'],
-          [Spree.t(:policy), 'ActionText::RichText'],
+          [Spree.t(:policy), 'Spree::Policy'],
           [Spree.t(:url), nil]
         ]
       end

data/app/models/concerns/spree/has_page_links.rb

@@ -17,7 +17,7 @@ module Spree
           [Spree.t(:product), 'Spree::Product'],
           [Spree.t(:post), 'Spree::Post'],
           [Spree.t(:taxon), 'Spree::Taxon'],
-          [Spree.t(:policy), 'ActionText::RichText'],
+          [Spree.t(:policy), 'Spree::Policy'],
           [Spree.t(:url), nil]
         ]
       end

data/app/models/concerns/spree/linkable.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Linkable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :page_links, as: :linkable, class_name: 'Spree::PageLink', dependent: :destroy
+    end
+  end
+end

data/app/models/concerns/spree/metadata.rb

@@ -2,6 +2,8 @@ module Spree
   module Metadata
     extend ActiveSupport::Concern
 
+    include Spree::Metafields unless included_modules.include?(Spree::Metafields)
+
     included do
       attribute :public_metadata, default: {}
       attribute :private_metadata, default: {}