2023/05/16更新

+ 追加した行
- 削除した行

 {% assign template = 'shop/customer/orders' %}
 {% include 'ec_force/shop/customer/orders/shared/nav.html' %}
 
+<!-- フラッシュメッセージ -->
+{{ 'notice' | flash: 'alert alert-success', 'text' }}
+{{ 'alert' | flash: 'alert alert-danger', 'text' }}
+{{ 'error' | flash: 'alert alert-danger', 'text' }}
+
 {% for order_item in order.order_items %}

       <button class="receipt-issue" value="{{ order.number }}">領収書発行</button>
     {% endif %}
   </div>
+
+  <!-- 決済エラーの場合に表示する支払い方法変更フォーム -->
+  {% if payment_methods_changable_flg %}
+    <div id="payment-method-edit-view">
+
+      <form action="/shop/customer/orders/{{ order.number }}" accept-charset="UTF-8" method="post">
+        <input type="hidden" name="_method" value="put">
+
+        <!-- 支払い方法変更 -->
+        <label for="order_payment_attributes_payment_method_id">支払方法</label>
+        <select name="order[payment_attributes][payment_method_id]" id="order_payment_attributes_payment_method_id">
+          {% for payment_method in payment_methods %}
+            <option value="{{ payment_method.id }}" {% if order.payment_method.id == payment_method.id %}selected{% endif %}>{{ payment_method.name }}</option>
+          {% endfor %}
+        </select>
+
+        <!-- クレジットカード選択 -->
+        <div id="credit-card">
+          <label for="order_payment_attributes_source_id">クレジットカード</label>
+          <select class="validate[required]" name="order[payment_attributes][source_id]" id="order_payment_attributes_source_id">
+            <option value="">--</option>
+            {% for card in credit_cards %}
+              <option value="{{ card.id }}" {% if selected_credit_card.id == card.id %}selected{% endif %}>{{ card.display_number_with_default }}</option>
+            {% endfor %}
+          </select>
+          <input value="EcForce::CreditCard" type="hidden" name="order[payment_attributes][source_type]" id="order_payment_attributes_source_type">
+        </div>
+
+        <!-- 分割回数 -->
+        <div class="form-group" style="display: none;">
+          <label for="order_payment_attributes_payment_times">分割回数</label>
+          <select name="order[payment_attributes][payment_times]" id="order_payment_attributes_payment_times">
+            {% for i in (2..24) %}
+              <option value="{{ i }}" {% if order.payment.payment_times == i %}selected{% endif %}>{{ i }}</option>
+            {% endfor %}
+          </select>
+        </div>
+
+        <!-- 送信リンク -->
+        <input type="submit" name="commit" value="保存" data-disable-with="保存中...">
+      </form>
+    </div>
+  {% endif %}
 </div>

       <form action="/shop/cart" method="post">
         <input name="_method" type="hidden" value="put">
         <input name="variant_id" type="hidden" value="{{ order_item.variant_id }}">
-        {% if order_item.set_item_quantity != 0 or order_item.product.distribution_club or order_item.distribution_item_quantity != 0 %}
+        {% if order_item.set? or order_item.set_item_quantity != 0 or order_item.product.distribution_club or order_item.distribution_item_quantity != 0 %}
           <span>  {{ order_item.quantity }}個 </span>
         {% else %}