update conflict oragimi.scss

app/views/origami/home/show.html.erb

@@ -220,7 +220,11 @@
                <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
              </tr>
              <tr>
-               <td class="charges-name"><strong>Discount:</strong></td>
+               <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%>
+                <td class="charges-name"><strong>Member Discount:</strong></td>
+               <%else%>
+                <td class="charges-name"><strong>Discount:</strong></td>
+               <%end%>
 
                <td class="item-attr"><strong id="order-discount">(<%= @obj_sale.total_discount rescue 0%>)</strong></td>
              </tr>
@@ -470,8 +474,24 @@ $('#request_bills').click(function() {
 		    url: ajax_url,
 		    // data: 'order_id='+ order_id,
 		    success:function(result){
-
-          location.reload();
+          if(!result.status){
+            $.confirm({
+              title: 'Infomation!',
+              content: result.error_message,
+              buttons: {
+                confirm: {
+                text: 'Ok',
+                btnClass: 'btn-green',
+                  action: function(){
+                    window.location.href = '/origami';
+                  }
+                }
+              }
+            });
+          }
+          else {
+            location.reload();
+          }
         }
 		});
 });