.htaccess

@@ -16,6 +16,12 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [L]
 </IfModule>
+
+<IfModule mod_headers.c>
+    Header always unset X-Frame-Options
+</IfModule>
+
+
 ###Start Kloxo PHP config Area
 ### begin content - please not remove this line
 #<IfModule mod_rewrite.c>
@@ -24,7 +30,7 @@ RewriteRule ^ index.php [L]
 #</FilesMatch>
 ### MR -- using php version different with default php
 ### 1. Using suphp
-### - Copy between '#<FilesMatch \.php$>' to '#</FilesMatch>' and 
+### - Copy between '#<FilesMatch \.php$>' to '#</FilesMatch>' and
 ###   then remove '#' from '#<FilesMatch', '#</FilesMatch>' and one of '#SetHandler'
 #<FilesMatch \.php$>
 	#SetHandler x-httpd-php
@@ -33,7 +39,7 @@ RewriteRule ^ index.php [L]
 #</FilesMatch>
 ### OR
 ### 2. Using fcgid
-### - Copy from '#Options' to '#FCGIWrapper' and 
+### - Copy from '#Options' to '#FCGIWrapper' and
 ###   then remove '#' for one of '#FCGIWrapper'
 #Options +ExecCGI
 #<FilesMatch \.php$>
@@ -44,3 +50,4 @@ RewriteRule ^ index.php [L]
 #FCGIWrapper /usr/bin/php73m-cgi .php
 ### end content - please not remove this line
 ###End Kloxo PHP config Area
+

app/Http/Controllers/Api/BlankerController.php

@@ -25,7 +25,7 @@ class BlankerController
 
     public function currPrice()
     {
-        $printingJson = request('PrintingJson');
+        $printingJson = json_decode(base64_decode(request('PrintingJson')), true);
         $result = response()->json($this->blankerService->colrow(
             $printingJson['p'],
             $printingJson['p3'],
@@ -63,7 +63,7 @@ class BlankerController
         $item = $response['Page'][0];
         return response()->json([
             'ItemName' => $item['ItemName'],
-            'CurrPrice' => $result['total_op'],
+            'CurrPrice' => (float)$result['total_op'],
         ]);
     }
 }

dabory/para/erp/ko_KR/copy/body-copy/stock/genio-genio.json

@@ -1,6 +1,6 @@
 {
     "General": {
-        "Title": "재고 항목 복사",
+        "Title": "재고 항목복사",
         "PageApi": "body-copy-page",
         "ActApi": "body-copy-mact"
     },

dabory/para/erp/ko_KR/form/form-b/purch/porder.json

@@ -193,7 +193,7 @@
     "// ListVars": "ListVars[0]-Caption, ListVars[1]-Size(%), ListVars[2]-align",
     "ListVars": [
         {
-            "$Radio": "$Radio",
+            "$Radio": "",
             "$Check": "$Check",
             "ItemCode": "품목코드*",
             "ItemName": "품명*",
@@ -212,7 +212,7 @@
             "PorderMemo": "품목설명(M)"
         },
         {
-            "$Radio": "3",
+            "$Radio": "",
             "$Check": "3",
             "ItemCode": "10",
             "ItemName": "30",
@@ -231,7 +231,7 @@
             "PorderMemo": "10"
         },
         {
-            "$Radio": "center",
+            "$Radio": "",
             "$Check": "center",
             "ItemCode": "left",
             "ItemName": "left",

dabory/para/erp/ko_KR/list/list-type1/post/1to1-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/1to1-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "6",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=6"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/certificate-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "32",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=32"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/contactus-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/contactus-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "7",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=7"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/event-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/event-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "3",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=3"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/faq-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "9",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=9"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/news-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "34",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=34"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/notice-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "1",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=1"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/product-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "31",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=31"
     },
 
     "HeadSelectOptions": [

dabory/para/erp/ko_KR/list/list-type1/post/qna-input.json

@@ -9,9 +9,10 @@
 
     "QueryVars": {
         "QueryName": "post/standard-input",
-        "FilterName": "mx.post_type_id",
-        "FilterValue": "4",
-        "FilterDate": ""
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "",
+        "SimpleFilter": "mx.post_type_id=4"
     },
 
     "HeadSelectOptions": [

index.html

@@ -1,7 +1,7 @@
 <html>
 
 <head>
-<title>Kloxo-MR : Default Page for newerp.daboryhost.com</title>
+<title>KloxoNG : Default Page for solution.dabory.com</title>
 </head>
 
 <style>
@@ -71,7 +71,7 @@ table.content_title td {
 		<td>
 			<table class="content">
 				<tr>
-					<td><a href="http://mratwork.com/" title="Go to Kloxo-MR website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxo-mr.png" alt="kloxo-mr-logo"></a></td>
+					<td><a href="http://kloxong.org" title="Go to Kloxo Next Generation website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxong.png" alt="kloxong-logo"></a></td>
 				</tr>
 
 			</table>
@@ -87,7 +87,7 @@ table.content_title td {
 			<tr>
 				<td><br>
 				<br>
-				<b>Kloxo-MR Default Page for newerp.daboryhost.com</b> </td>
+				<b>Kloxo Next Generation Default Page for solution.dabory.com</b> </td>
 			</tr>
 		</table>
 		<br>

public/js/modals-controller/b-type/common.js

@@ -174,11 +174,11 @@
             }
         })
         // 현재 선택된 input요소의 tr에서 첫번째 td의 input 요소의 name
-        // let cursor = $(tr).find('td:eq(0) input').attr('name')
-        let cursor = $(tr).find('td:eq(0) input');
-        if(cursor.is(':hidden')){
-            cursor = $(tr).find('td:eq(1) input').attr('name')
-        }
+        let cursor = $(tr).find('td:eq(0) input').attr('name')
+        // let cursor = $(tr).find('td:eq(0) input');
+        // if(cursor.is(':hidden')){
+        //     cursor = $(tr).find('td:eq(1) input').attr('name')
+        // }
 
         $(table).find(`input[name='${cursor}']`).each(function (i) {
             if (! $(this).is(':checked')) {
@@ -515,9 +515,6 @@
 
         let up_or_down_val = (move == 'up' ? -1 : 1);
         let temp_bd_page = Btype.change_array_order(eval(namespace).bd_page, index, up_or_down_val);
-        console.log(eval(namespace).bd_page,)
-        console.log(index)
-        console.log(up_or_down_val)
         if (! temp_bd_page) {
             iziToast.error({
                 title: 'Error',

public/js/modals-controller/b-type/slip.js

@@ -59,6 +59,7 @@ const slip = (function ($, window, document, undefined) {
 
 
     slip_open = (limit, offset, page = 1) => {
+        console.log('slip_open');
         let html = ''
         let menu_code = (typeof menuCode === 'undefined') ? false : menuCode
         let modal_class_name = $(id).data('class') || ''
@@ -73,6 +74,23 @@ const slip = (function ($, window, document, undefined) {
 
         $(id).find('.slip-save-spinner-btn').show()
         $(id).find('.slip-search-btn').hide()
+        console.log(moealSetFile['General']['PageApi']);
+        console.log('FilterName : ', $(id).find('#filter-name-select').val());
+        console.log('FilterValue : ', $(id).find('#filter-value-txt').val());
+        console.log('SimpleFilter : ', $(id).find('#simple-filter-select').val());
+        console.log('StartDate : ', start_date);
+        console.log('EndDate : ', end_date);
+        console.log('QuerySpeed : ', $(id).find(`input:radio[name=${modal_class_name}query-speed]:checked`).val());
+        console.log('SlipNo : ', $(id).find('.slip-no').val());
+        console.log('CompanyName : ', $(id).find('.company-name').val());
+        console.log('ItemCode : ', $(id).find('.item-code').val());
+        console.log('OrderBy : ', $(id).find('.modal-order-by-select').val());
+
+        console.log('SlipDateField : ', moealSetFile['SlipSearchFields']['SlipDateField']);
+        console.log('SlipNoField : ', moealSetFile['SlipSearchFields']['SlipNoField']);
+
+        console.log('Limit : ', parseInt(limit));
+        console.log('Offset : ', parseInt(offset));
 
         $.when(get_api_data(moealSetFile['General']['PageApi'], {
             QueryVars: {

resources/views/auth/login.blade.php

@@ -83,12 +83,30 @@
 </div>
 <!-- /login card -->
 @endsection
-
+<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/aes.js"></script>
 <script>
     window.onload = function() {
         history.pushState(null, null, location.href);
         window.onpopstate = function(event) {
             history.go(1);
         };
+
+        // let passData = { returnValue : 200 };
+        // window.parent.postMessage(passData, 'http://localhost:8000');
     }
+
+    // window.addEventListener('message', function(e) {
+    //     //e.data ==> 수신 받은 데이터
+    //     //e.origin ==> 허용된 도메인
+    //     const req = JSON.parse(decoding(e.data))
+    //     console.log(req)
+    //     console.log(JSON.parse(decoding(req['PrintingJson'])))
+    // });
+
+    // function decoding(encoded){
+    //     //base64 decrypt
+    //     var parsedWordArray = CryptoJS.enc.Base64.parse(encoded);
+    //     var decoded = parsedWordArray.toString(CryptoJS.enc.Utf8);
+    //     return decoded;
+    // }
 </script>

resources/views/front/dabory/erp/purchase/porder.blade.php

@@ -53,10 +53,10 @@
                                     <div class="form-group d-flex flex-column mb-2">
                                         <label class="m-0 overflow-hidden text-nowrap">{{ $formB['FormVars']['Title']['AutoSlipNo'] }}</label>
                                         <div class="col-12 d-flex p-0">
-                                            <button id="auto-slip-no-btn" class="btn-dark border-white rounded overflow-hidden col-3 text-center text-white text-nowrap radius-r0"
-                                                onclick="get_last_slip_no(this)">
-                                                <span class="icon-cogs"></span>
-                                            </button>
+                                        {{-- <button id="auto-slip-no-btn" class="btn-dark border-white rounded overflow-hidden col-3 text-center text-white text-nowrap radius-r0" --}}
+                                        {{--         onclick="get_last_slip_no(this)"> --}}
+                                        {{--         <span class="icon-cogs"></span> --}}
+                                        {{--     </button> --}}
                                             <input type="text" id="auto-slip-no-txt" class="rounded w-100 radius-l0" autocomplete="off" disabled
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['AutoSlipNo'] }}"
                                                 {{ $formB['FormVars']['Required']['AutoSlipNo'] }}>
@@ -353,11 +353,14 @@
             Btype.get_storage_name_and_branch_name()
             let data = await Btype.get_slip_form_init()
             // console.log(data)
-            formB['SlipCommonSetup'] = data['SlipCommonSetup']
-            await Btype.create_deal_type_select_box_options(data.DealTypePage)
-            await Btype.create_vat_type_select_box_options(data.VatRatePage)
-            await Btype.create_sgroup_select_box_options(data.SgroupPage)
-            await create_etc_select_box_options(data)
+
+            slipInit = await Btype.get_slip_form_init()
+            // formB['SlipCommonSetup'] = data['SlipCommonSetup']
+            formB['SlipCommonSetup'] = slipInit['SlipCommonSetup']
+            await Btype.create_deal_type_select_box_options(slipInit.DealTypePage)
+            await Btype.create_vat_type_select_box_options(slipInit.VatRatePage)
+            await Btype.create_sgroup_select_box_options(slipInit.SgroupPage)
+            await create_etc_select_box_options(slipInit)
             $('#user-txt').val(window.User['NickName'])
 
             if (formB['SlipCommonSetup']['IsLastSlipGet']) {
@@ -370,6 +373,15 @@
                 }
             }
 
+            $('#porder-table-body').on('click', 'tr', function() {
+                // Find the input element with name="bd-cursor-state" within the clicked row
+                const $bdCursorStateInput = $(this).find('input[name="bd-cursor-state"]');
+                if ($bdCursorStateInput.length) {
+                    $($bdCursorStateInput).prop('checked', true)
+                    Btype.bd_cursor_click($bdCursorStateInput)
+                }
+            });
+
             $('.porder-act').on('click', function () {
                 // console.log($(this).data('value'))
                 switch( $(this).data('value') ) {
@@ -537,7 +549,9 @@
                     Btype.body_act_success_callback($this, tr);
                     Btype.check_the_checkbox_when_changing($this, false)
                 });
+                console.log('필수데이터 노누락');
             } else {
+                console.log('필수데이터 누락');
                 iziToast.error({
                     title: 'Error',
                     message: @json(_e('(*)Required item(s) omitted')),
@@ -547,8 +561,11 @@
 
         // start body act btn
         async function btn_bd_act_add() {
-            if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0 && formB['SlipCommonSetup']['IsAutoSaveHdByItemButton']) {
+            // if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0 && formB['SlipCommonSetup']['IsAutoSaveHdByItemButton']) {
+            if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0) {
                 if (! await Btype.btn_act_add_chain('#porder-form #frm')) { return }
+            }else{
+                console.log('formb.SlipCommonSetup : ', formB['SlipCommonSetup']);
             }
 
             if (! Btype.last_item_added_check('#porder-table-body')) {
@@ -641,6 +658,21 @@
         }
 
         function get_parameter() {
+            console.log('get_parameter()');
+            const deal_name = slipInit['DealTypePage'].filter(page => page['Id'] === Number($('#deal-type-select').val()))[0]['DealName']
+            const vat_rate = $('#vat-type-select').find('option:selected').data('vatrate')
+            const vat_name = slipInit['VatRatePage'].filter(page => page['Id'] === Number($('#vat-type-select').val()))[0]['VatName']
+            let first_item = ''
+
+            if (bd_page.length > 0) {
+                const first_porder = bd_page[0]
+                first_item = first_porder['ItemCode'] + '_' + first_porder['ItemName']
+                if (first_porder['SubName']) {
+                    first_item += '_' + first_porder['SubName']
+                }
+                first_item += '(' + bd_page.length + ')'
+            }
+
             let id = parseInt($(`#frm`).find(`input[name="Id"]`).val());
             let parameter = {
                 Id: id,
@@ -667,8 +699,19 @@
                 // Remarks: $('#remarks-preview').html(),
                 Remarks: $('#remarks-txt-area').val(),
                 PayPeriod: '',
-                Ip: window.User['Ip']
+                Ip: window.User['Ip'],
+
+                FirstItem: first_item,
+                ItmtotAmt: String(itmtot_amt),
+                DiscountAmt: '0',
+                TotalAmt: String(Number(itmtot_amt) - 0),
+                DealName: deal_name,
+                VatRate: vat_rate,
+                VatName: vat_name,
+                SgroupName: window.User['SgroupName']
             }
+
+            console.log('parameter : ', parameter);
             if (id < 0) {
                 parameter = { Id: id }
             } else if (id > 0) {
@@ -735,6 +778,7 @@
         }
 
         function set_vat_type_rate($this, msg = true) {
+            console.log('set_vat_type_rate');
             let vate_rate = $($this).find('option:selected').data('viewvatrate');
             $('#vat-type-rate-text').val(vate_rate + '%')
 
@@ -800,7 +844,7 @@
                 // 품목코드, 수량, 단가, 공급가액, 세액, 합계금액
                 html.push (
                 `<tr>
-                    <td class="text-${formB.ListVars['Align'].$Radio} px-import-0">
+                    <td class="text-${formB.ListVars['Align'].$Radio} px-import-0" ${formB.ListVars['Hidden'].$Radio}>
                         <input name="bd-cursor-state" type="radio" value="1" tabindex="-1"
                         class="text-${formB.ListVars['Align'].$Radio}"
                         onclick="Btype.bd_cursor_click(this)">
@@ -812,13 +856,13 @@
                     <td onkeydown="Btype.enterPressedinCell(event)"
                         class="text-${formB.ListVars['Align'].ItemCode}" ${formB.ListVars['Hidden'].ItemCode}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" value="${bd.ItemCode}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" value="${bd.ItemCode}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)" required>
                     </td>
                     <td onkeydown="Btype.enterPressedinCell(event, 2)"
                         class="text-${formB.ListVars['Align'].ItemName}" ${formB.ListVars['Hidden'].ItemName}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" value="${bd.ItemName}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" value="${bd.ItemName}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)" required>
                     </td>
                     <td
@@ -830,7 +874,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].PorderQty}" ${formB.ListVars['Hidden'].PorderQty}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" value="${format_conver_for(bd.PorderQty, formB.ListVars['Format'].PorderQty)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" value="${format_conver_for(bd.PorderQty, formB.ListVars['Format'].PorderQty)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_amt_calc_txt_is_changed()"
                         required>
@@ -838,7 +882,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].PorderPrc}" ${formB.ListVars['Hidden'].PorderPrc}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" value="${format_conver_for(bd.PorderPrc, formB.ListVars['Format'].PorderPrc)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" value="${format_conver_for(bd.PorderPrc, formB.ListVars['Format'].PorderPrc)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_amt_calc_txt_is_changed()"
                         required>
@@ -846,7 +890,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].SupplyAmt}" ${formB.ListVars['Hidden'].SupplyAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSupply, formB.ListVars['Format'].SupplyAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSupply, formB.ListVars['Format'].SupplyAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_supply_amt_or_vat_amt()"
                         required>
@@ -854,7 +898,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].VatAmt}" ${formB.ListVars['Hidden'].VatAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" value="${format_conver_for(bd.PorderVat, formB.ListVars['Format'].VatAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" value="${format_conver_for(bd.PorderVat, formB.ListVars['Format'].VatAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_supply_amt_or_vat_amt()"
                         required>
@@ -862,7 +906,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSum, formB.ListVars['Format'].SumAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSum, formB.ListVars['Format'].SumAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_sum_amt()"
                         required>
@@ -873,7 +917,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].ConfirmDate}" ${formB.ListVars['Hidden'].ConfirmDate}
                         >
-                        <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" value="${isEmpty(bd.ConfirmDate) ? '' : moment(bd.ConfirmDate).format('YYYY-MM-DD')}" disabled
+                        <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" value="${isEmpty(bd.ConfirmDate) ? '' : moment(bd.ConfirmDate).format('YYYY-MM-DD')}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -881,7 +925,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].DeliDate}" ${formB.ListVars['Hidden'].DeliDate}
                         >
-                        <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" value="${isEmpty(bd.DeliDate) ? '' : moment(bd.DeliDate).format('YYYY-MM-DD')}" disabled
+                        <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" value="${isEmpty(bd.DeliDate) ? '' : moment(bd.DeliDate).format('YYYY-MM-DD')}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()"
                         required>
@@ -889,7 +933,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].Ref1}" ${formB.ListVars['Hidden'].Ref1}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" value="${bd.Ref1}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" value="${bd.Ref1}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -897,7 +941,7 @@
                         onfocusout="add_td_last_tap_out(this, ${bd.Id})"
                         class="text-${formB.ListVars['Align'].Ref2}" ${formB.ListVars['Hidden'].Ref2}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white" value="${bd.Ref2}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white" value="${bd.Ref2}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -926,7 +970,7 @@
 
             let html =
             `<tr>
-                <td class="text-${formB.ListVars['Align'].$Radio} px-import-0">
+                <td class="text-${formB.ListVars['Align'].$Radio} px-import-0" ${formB.ListVars['Hidden'].$Radio}>
                     <input name="bd-cursor-state" type="radio" value="1" tabindex="-1"
                     class="text-${formB.ListVars['Align'].$Radio}"
                     id="bd-cursor-state-${last_bd_id_inc}"
@@ -939,14 +983,14 @@
                 <td onkeydown="Btype.enterPressedinCell(event)"
                     class="text-${formB.ListVars['Align'].ItemCode}" ${formB.ListVars['Hidden'].ItemCode}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     id="item-code-${last_bd_id_inc}" required>
                 </td>
                 <td onkeydown="Btype.enterPressedinCell(event, 2)"
                     class="text-${formB.ListVars['Align'].ItemName}" ${formB.ListVars['Hidden'].ItemName}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)" required>
                 </td>
                 <td
@@ -958,7 +1002,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].PorderQty}" ${formB.ListVars['Hidden'].PorderQty}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_amt_calc_txt_is_changed()"
                     required>
@@ -966,7 +1010,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].PorderPrc}" ${formB.ListVars['Hidden'].PorderPrc}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_amt_calc_txt_is_changed()"
                     required>
@@ -974,7 +1018,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].SupplyAmt}" ${formB.ListVars['Hidden'].SupplyAmt}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_custom_supply_amt_or_vat_amt()"
                     required>
@@ -982,13 +1026,13 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].VatAmt}" ${formB.ListVars['Hidden'].VatAmt}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_custom_supply_amt_or_vat_amt()"
                     required>
                 </td>
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
-                    class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt}
+                    class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt} readonly
                     >
                     <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
@@ -1001,7 +1045,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].ConfirmDate}" ${formB.ListVars['Hidden'].ConfirmDate}
                     >
-                    <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white"
+                    <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" readonly
                     value="${moment().format('YYYY-MM-DD')}"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
@@ -1010,7 +1054,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].DeliDate}" ${formB.ListVars['Hidden'].DeliDate}
                     >
-                    <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white"
+                    <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" readonly
                     value="${moment().format('YYYY-MM-DD')}"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()"
@@ -1019,7 +1063,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].Ref1}" ${formB.ListVars['Hidden'].Ref1}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
                 </td>
@@ -1027,7 +1071,7 @@
                     data-last=true onfocusout="add_td_last_tap_out(this, ${last_bd_id_inc})"
                     class="text-${formB.ListVars['Align'].Ref2}" ${formB.ListVars['Hidden'].Ref2}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white"readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
                 </td>
@@ -1153,5 +1197,6 @@
         const pickCacheData = {!! json_encode($pickCacheData) !!};
         var formB = {!! json_encode($formB) !!};
         var bd_page = [];
+        let slipInit = null;
     </script>
 @endsection

resources/views/front/dabory/erp/stock/genio.blade.php

@@ -296,12 +296,8 @@
             }
 
             $('.genio-act').on('click', function () {
-                console.log($(this).data('value'));
-                console.log($(this).data('parameter')); //여기까진 들어옴
-                console.log('여기서 문제? : ', str_replace_hyphen($(this).data('parameter'), '/'));
                 // console.log($(this).data('value'))
                 switch( $(this).data('value') ) {
-
                     case 'save': Btype.btn_act_save('#genio-form #frm'); break;
                     case 'new': btn_act_new(); break;
                     case 'copy-to-another': btn_act_copy_to_another(str_replace_hyphen($(this).data('parameter'), '/')); break;
@@ -313,7 +309,6 @@
             $('#remarks-txt-area').on('dblclick', function () {
                 $('#modal-memo2').find('#memo-textarea').val('')
                 $('#modal-memo2').data('txtarea_id', '#remarks-txt-area')
-                // 모달창 textarea에 입력한 값을 넣어줌
                 $('#modal-memo2').find('#memo-textarea').val($('#remarks-txt-area').val())
                 $('#modal-memo2').modal('show');
             });
@@ -350,6 +345,7 @@
         }
 
         function get_parameter() {
+            console.log('get_parameter()');
             const deal_name = slipInit['DealTypePage'].filter(page => page['Id'] === Number($('#deal-type-select').val()))[0]['DealName']
             const vat_rate = $('#vat-type-select').find('option:selected').data('vatrate')
             const vat_name = slipInit['VatRatePage'].filter(page => page['Id'] === Number($('#vat-type-select').val()))[0]['VatName']
@@ -460,6 +456,7 @@
         }
 
         function set_vat_type_rate($this, msg = true) {
+            console.log('set_vat_type_rate');
             let vate_rate = $($this).find('option:selected').data('viewvatrate');
             $('#vat-type-rate-text').val(vate_rate + '%')
 

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

@@ -120,7 +120,6 @@
         $('#genio-table-body').on('click', 'tr', function() {
                 // Find the input element with name="bd-cursor-state" within the clicked row
                 const $bdCursorStateInput = $(this).find('input[name="bd-cursor-state"]');
-                // console.log('bdCursorStateInput : ', $bdCursorStateInput)
                 if ($bdCursorStateInput.length) {
                     $($bdCursorStateInput).prop('checked', true)
                     Btype.bd_cursor_click($bdCursorStateInput)
@@ -189,7 +188,7 @@
             // $(`#modal-bodycopy.${parameter_name}`).find('.slip_no-txt').val($('#auto-slip-no-txt').val())
             $(`#modal-bodycopy.${parameter_name}`).find('.company_name-txt').val($('#supplier-txt').val())
             let data = formB['BodySelectOptions'].filter(selectOption => selectOption['ModalClassName'] == parameter_name)[0];
-            console.log('data : ', data);
+            // console.log('data : ', data);
             $('.stock').find('.modal-btn').data('target', 'bodycopy')
             $('.stock').find('.modal-btn').data('variable', data['Parameter'])
             $('.stock').find('.modal-btn').data('class', parameter_name)

resources/views/front/outline/static/body-copy.blade.php

@@ -1,7 +1,5 @@
 <!--- body-copy-search --->
-@php $modalClassName = $modalClassName ?? '';
-    //var_dump($moealSetFile['BodyCopyPageVars'])
-@endphp
+@php $modalClassName = $modalClassName ?? ''; @endphp
 
 <div class="modal fade modal-red {{ $modalClassName }}" id="modal-bodycopy" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1050;">
     <div class="modal-dialog m-auto pt-4" style="max-width: 1250px;">
@@ -157,8 +155,6 @@
 <script>
     function body_copy_show_modal(modal_class_name, key) {
         let func_name = `get_${bodyCopy[modal_class_name]['BodyCopyPopupVars']['Filter'][key]}`;
-
-        console.log('func_name : ',  func_name);
         // 첫 번째 show 했을 때만 호출
         if (! $(`#modal-bodycopy.${modal_class_name}`).find('.modal-btn').data('first')) {
             first_slip_date_rang(`#${modal_class_name}slip-date-navi-div`)

resources/views/front/outline/static/slip.blade.php

@@ -4,7 +4,7 @@
 <div class="modal fade modal-brown {{ $modalClassName }}" id="modal-slip" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1060;">
     <div class="modal-dialog m-auto pt-4" style="max-width: 1250px !important;">
         <div class="modal-content">
-            <div class="modal-header bg-primary test111"><!--p-2-->
+            <div class="modal-header bg-primary"><!--p-2-->
                 <h4 class="modal-title text-white" id="myModalLabel"></h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fas fa-times"></i></button>
             </div>