commit

resources/views/front/dabory/erp/revenue/sorder.blade.php

@@ -695,10 +695,6 @@
                 return accumulator + parseFloat(bd.SorderQty)
             }, 0)
 
-            const total_qty = bd_page.reduce((accumulator, bd) => {
-                return accumulator + parseFloat(bd.SorderQty)
-            }, 0)
-
             let id = parseInt($(`#frm`).find(`input[name="Id"]`).val());
             let parameter = {
                 Id: id,

resources/views/front/dabory/erp/stock/tab/genio-correct.blade.php

@@ -553,37 +553,6 @@
             }
 
             GenioCorrect.add_td_last_tap_out = async function ($this, id) {
-<<<<<<< HEAD
-                let tr = $('#correct-tab').find(`input[name='bd-cursor-state']:checked`).closest('tr')
-                let index = $(tr).prevAll().length
-                // 필수텍스트가 안비어있으고 fouces out == 다음 tr 추가
-                if (GenioCorrect.bd_page[index].ItemId != 0 && ! window.dom_required_check($(tr).find(`input`))) {
-                    if ($($this).data('last')) {
-                        let seq_no = await Btype.get_last_seq_no('genio', $('#genio-form').find('#auto-slip-no-txt').val())
-                        GenioCorrect.bd_page[index].SeqNo = seq_no;
-                    }
-
-                    Btype.call_bd_act_api([ GenioCorrect.get_bd_parameter(GenioCorrect.bd_page[index]) ], function (page) {
-                        GenioCorrect.bd_page[index].Id = page[0].Id;
-                        GenioCorrect.custom_body_act_success_callback($this, tr);
-                        Btype.check_the_checkbox_when_changing($this, false, 'GenioCorrect')
-                    }, 'GenioCorrect');
-
-                    let itemCodeInput = $(tr).find(`input[type="text"]`).first();
-                    let itemNameInput = $(tr).find(`input[type="text"]`).eq(1);
-                    if (itemCodeInput.length > 0) {
-                        Btype.set_slip_no_btn_disabled(itemCodeInput)
-                        Btype.set_slip_no_btn_disabled(itemNameInput)
-                        // $(firstTextInput).addClass('border-0 bg-white')
-                        // $(firstTextInput).prop('readonly', true)
-                    }
-                } else {
-                    iziToast.error({
-                        title: 'Error',
-                        message: @json(_e('(*)Required item(s) omitted')),
-                    });
-                }
-=======
                 Btype.btn_act_save('#squote-form #frm', async function () {
                     let tr = $('#correct-tab').find(`input[name='bd-cursor-state']:checked`).closest('tr')
                     let index = $(tr).prevAll().length
@@ -615,7 +584,6 @@
                         });
                     }
                 });
->>>>>>> a3549ead64c49eba9dfb0a96194234817b547b6d
             }
 
             GenioCorrect.get_bd_parameter = function (bd) {