241004-1140-Kim

dabory/para/erp/ko_KR/form/form-a/company-tabbed.json

@@ -25,7 +25,7 @@
         {
             "SaveButton": "저장",
             "TAB1": "핵심정보",
-            "TAB2": "사업자 등록정보",
+            "TAB2": "사업자/계좌정보",
             "TAB3": "판매회원 정보",
             "CompanyNo": "업체 등록번호*(판매회원코드)",
             "TaxNo": "사업자 등록번호",
@@ -51,7 +51,11 @@
             "SellerId": "판매회원",
             "SalesBrand": "영업브랜드명",
             "SiteUrl": "웹사이트URL",
-            "SnsAccount": "SNS계정"
+            "SnsAccount": "SNS계정",
+            "BankName": "은행명",
+            "AccountNo": "입금계좌",
+            "HolderName": "예금주",
+            "AccountImg": "통장사본이미지"
         },
         {
             "SaveButton": "",
@@ -81,7 +85,11 @@
             "SellerId": "left",
             "SalesBrand": "left",
             "SiteUrl": "left",
-            "SnsAccount": "left"
+            "SnsAccount": "left",
+            "BankName": "left",
+            "AccountNo": "left",
+            "HolderName": "left",
+            "AccountImg": "left"
         },
         {
             "SaveButton": "0",
@@ -111,7 +119,11 @@
             "SellerId": "0",
             "SalesBrand": "128",
             "SiteUrl": "128",
-            "SnsAccount": "128"
+            "SnsAccount": "128",
+            "BankName": "128",
+            "AccountNo": "128",
+            "HolderName": "128",
+            "AccountImg": "128"
         },
         {
             "SaveButton": "",
@@ -141,7 +153,11 @@
             "SellerId": "disabled",
             "SalesBrand": "",
             "SiteUrl": "",
-            "SnsAccount": ""
+            "SnsAccount": "",
+            "BankName": "",
+            "AccountNo": "",
+            "HolderName": "",
+            "AccountImg": ""
         }
     ],
     "CompanyClassOptions": [

dabory/para/erp/ko_KR/search/slip-search/acc-slip.json

@@ -107,7 +107,7 @@
         {
             "No": "번호",
             "SlipNo": "전표 번호",
-            "DealCode": "거래구분",
+            "DealName": "거래구분",
             "Company": "관련 업체",
             "SetGroup": "지불방법",
             "Item": "부서/담당자/적요",
@@ -118,7 +118,7 @@
         {
             "No": "6",
             "SlipNo": "13",
-            "DealCode": "10",
+            "DealName": "10",
             "Company": "20",
             "SetGroup": "20",
             "Item": "30",
@@ -129,7 +129,7 @@
         {
             "No": "center",
             "SlipNo": "center",
-            "DealCode": "deal_type('deal-type')",
+            "DealName": "center",
             "Company": "left",
             "SetGroup": "bill_type('bill-type')",
             "Item": "center",

resources/views/front/dabory/erp/list-type/setup-type1.blade.php

@@ -254,17 +254,15 @@
         }
 
         function converter_setup_data(popup_option) {
-            console.log('converter_setup_data');
-            console.log('popup_option : ', popup_option);
-            // if(setupType1.DisplayVars.IsThemeSetup){
-            //     popup_option['BladeRoute'] = `dabory.themes.erp.${popup_option['Component']}`;
-            // }
             popup_option['BladeRoute'] = `front.dabory.erp.${popup_option['Component']}`;
             popup_option['ModalClassName'] = paramCase(popup_option['Component']);
             return popup_option;
         }
 
         async function show_select_popup(id, c1) {
+            const setup_pick = setupType1.DisplayVars.IsThemeSetup ? 'theme-setup-pick' : 'setup-pick'
+            const theme_dir = setup_pick === 'theme-setup-pick' ? "{{ env('DBR_THEME') }}/erp" : '';
+
             if ($('.setupType1-table').find('#c1-tag').prop('disabled')) return;
             $('.setupType1-table').find(`input[name='bd-cursor-state']`).prop('disabled', true)
             $('.setupType1-table').find('#c1-tag').prop('disabled', true);
@@ -273,10 +271,7 @@
             //     Page: [ { Id: Number(id) } ]
             // })
 
-            let response = await get_api_data(
-                setupType1.DisplayVars.IsThemeSetup ? 'theme-setup-pick' : 'setup-pick',
-                { Page: [{ Id: Number(id) }] }
-            );
+            let response = await get_api_data(setup_pick, { Page: [{ Id: Number(id) }] });
 
             console.log(response);
 
@@ -284,7 +279,7 @@
             let setup_json = setup.SetupJson ? JSON.parse(setup.SetupJson) : {}
             const brand_code = setup.BrandCode
             const parameter_type = camelCase(setup['Parameter'].split('/')[3])
-            console.log('setup : ', setup);
+
             setup = converter_setup_data({
                 Caption: setup['SetupName'],
                 Component: setup['Component'],
@@ -292,7 +287,8 @@
                 ParameterType: parameter_type,
             })
 
-            response = await get_para_data(setup['ParameterType'], setup['ParameterDir'], getParameterByName('bpa'))
+            // response = await get_para_data(setup['ParameterType'], setup['ParameterDir'], getParameterByName('bpa'))
+            response = await get_para_data(setup['ParameterType'], setup['ParameterDir'], getParameterByName('bpa'), theme_dir)
             setup['Parameter'] = response['data']['data']
 
             get_blades_html('front.outline.static.select-popup', setup, async function (html) {

resources/views/front/dabory/erp/master-data/company-tabbed.blade.php

@@ -42,10 +42,10 @@
                     <div class="tab-pane fade show active" id="tab1">
                         <div class="card-header">
                             <div class="stit">
-                                <h3>핵심정보</h3>
+                                <h3>{{ $formA['FormVars']['Title']['TAB1'] }}</h3>
                             </div>
                             <div class="row">
-                                <div class="col-md-4 card-header-item">
+                                <div class="col-md-6 col-12 col-lg card-header-item">
                                     <div class="card card card-primary mb-3 mb-md-0 border-light">
                                     {{-- <div class="card-header p-1 mb-2"> 핵심정보 </div> --}}
                                         <div class="card-body">
@@ -144,6 +144,24 @@
                                     </div>
                                 </div>
                                 <!-- card-header-company -->
+
+                                <div class="col-md-6 col-12 col-lg card-header-item">
+                                    <div class="card card card-success mb-3 mb-md-0 border-light">
+                                        <div class="card-body">
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['Remarks'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['Remarks'] }}</label>
+                                                <br>
+                                                <div class="fr-view" id="remarks-preview" hidden></div>
+                                                <textarea style="height: 75px;" tabindex="-1" class="rounded w-100 bg-white mr-1" id="remarks-txt-area" role="button" readonly></textarea>
+                                            </div>
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['IsDealEnd'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['IsDealEnd'] }}</label>
+                                                <br>
+                                                <input type="checkbox" value="1" id="is-deal-end-check"><label for="is-deal-end-check"></label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                             <!-- row 끝 -->
                         </div>
@@ -151,20 +169,17 @@
                     </div>
                     <!-- tab-pane 끝 -->
 
-
-
-                    <!-- 사업자 등록정보 시작 -->
+                    <!-- 사업자/계좌정보 시작 -->
                     <div id="anch-tab2" class="anch"></div>
                     <div class="tab-pane fade show active" id="tab2">
                         <div class="card-header">
                             <div class="stit">
-                                <h3>사업자 등록정보</h3>
+                                <h3>{{ $formA['FormVars']['Title']['TAB2'] }}</h3>
                             </div>
                             <div class="row">
                                 <!-- 왼쪽 컬럼 -->
-                                <div class="col-md-4">
+                                <div class="col-md-6 col-12 col-lg card-header-item">
                                     <div class="card card card-info mb-3 mb-md-0 border-light">
-                                    {{-- <div class="card-header p-1 mb-2"> 사업자 등록정보 </div> --}}
                                         <div class="card-body">
                                             <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['TaxNo'] }}>
                                                 <label class = "m-0">{{ $formA['FormVars']['Title']['TaxNo'] }}</label>
@@ -232,19 +247,36 @@
                                     </div>
                                 </div>
 
-                                <div class="col-md-4">
+                                <div class="col-md-6 col-12 col-lg card-header-item">
                                     <div class="card card card-success mb-3 mb-md-0 border-light">
                                         <div class="card-body">
-                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['Remarks'] }}>
-                                                <label class = "m-0">{{ $formA['FormVars']['Title']['Remarks'] }}</label>
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['BankName'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['BankName'] }}</label>
                                                 <br>
-                                                <div class="fr-view" id="remarks-preview" hidden></div>
-                                                <textarea style="height: 75px;" tabindex="-1" class="rounded w-100 bg-white mr-1" id="remarks-txt-area" role="button" readonly></textarea>
+                                                <input type="text" id="bank-name-txt" class="rounded w-100"
+                                                    maxlength="{{ $formA['FormVars']['MaxLength']['BankName'] }}"
+                                                    {{ $formA['FormVars']['Required']['BankName'] }}>
                                             </div>
-                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['IsDealEnd'] }}>
-                                                <label class = "m-0">{{ $formA['FormVars']['Title']['IsDealEnd'] }}</label>
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['AccountNo'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['AccountNo'] }}</label>
                                                 <br>
-                                                <input type="checkbox" value="1" id="is-deal-end-check"><label for="is-deal-end-check"></label>
+                                                <input type="text" id="account-no-txt" class="rounded w-100"
+                                                    maxlength="{{ $formA['FormVars']['MaxLength']['AccountNo'] }}"
+                                                    {{ $formA['FormVars']['Required']['AccountNo'] }}>
+                                            </div>
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['HolderName'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['HolderName'] }}</label>
+                                                <br>
+                                                <input type="text" id="holder-name-txt" class="rounded w-100"
+                                                    maxlength="{{ $formA['FormVars']['MaxLength']['HolderName'] }}"
+                                                    {{ $formA['FormVars']['Required']['HolderName'] }}>
+                                            </div>
+                                            <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['AccountImg'] }}>
+                                                <label class = "m-0">{{ $formA['FormVars']['Title']['AccountImg'] }}</label>
+                                                <br>
+                                                <input type="text" id="account-img-txt" class="rounded w-100"
+                                                    maxlength="{{ $formA['FormVars']['MaxLength']['AccountImg'] }}"
+                                                    {{ $formA['FormVars']['Required']['AccountImg'] }}>
                                             </div>
                                         </div>
                                     </div>
@@ -253,7 +285,7 @@
                             <!-- row 종료 -->
                         </div>
                     </div>
-                    <!--//사업자 등록정보 끝 -->
+                    <!--//사업자/계좌정보 끝 -->
 
 
                     <!-- 판매회원 정보 시작 -->
@@ -261,13 +293,12 @@
                     <div class="tab-pane fade show active" id="tab3">
                         <div class="card-header">
                             <div class="stit">
-                                <h3>판매회원 정보</h3>
+                                <h3>{{ $formA['FormVars']['Title']['TAB3'] }}</h3>
                             </div>
                             <div class="row">
                                 <!-- 왼쪽 컬럼 -->
                                 <div class="col-md-4">
                                     <div class="card card card-info mb-3 mb-md-0 border-light">
-                                    {{-- <div class="card-header p-1 mb-2"> 사업자 등록정보 </div> --}}
                                         <div class="card-body">
                                             <div class="form-group flex-column mb-3" id="seller-id-div" style="display: block;">
                                                 <label class="m-0" {{ $formA['FormVars']['Required']['SellerId'] }}>

resources/views/front/dabory/erp/popup-setup/form-a/theme-setup-example-form.blade.php

@@ -22,22 +22,22 @@
                         </div>
                         <div class="card-body">
                             <input type="hidden" id="Id" name="Id" value="0">
-                            <div class="d-flex flex-column mb-2">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['SetupName'] }}</label>
-                                <input type="text" id="setup-name-txt" class="rounded w-100" autocomplete="off">
-                            </div>
-                            <div class="d-flex flex-column mb-2">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['SetupCode'] }}</label>
-                                <input type="text" id="setup-code-txt" class="rounded w-100" autocomplete="off">
-                            </div>
-                            <div class="d-flex flex-column mb-2">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['SeqNo'] }}</label>
-                                <input type="text" id="seq-no-txt" class="rounded w-100" autocomplete="off">
-                            </div>
-                            <div class="d-flex flex-column mb-2">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['BrandCode'] }}</label>
-                                <input type="text" id="brand-code-txt" class="rounded w-100" autocomplete="off">
-                            </div>
+                            {{--<div class="d-flex flex-column mb-2">--}}
+                            {{--    <label class="m-0">{{ $formA['FormVars']['Title']['SetupName'] }}</label>--}}
+                                {{--    <input type="text" id="setup-name-txt" class="rounded w-100" autocomplete="off">--}}
+                                {{--</div>--}}
+                            {{--<div class="d-flex flex-column mb-2">--}}
+                            {{--    <label class="m-0">{{ $formA['FormVars']['Title']['SetupCode'] }}</label>--}}
+                                {{--    <input type="text" id="setup-code-txt" class="rounded w-100" autocomplete="off">--}}
+                                {{--</div>--}}
+                            {{--<div class="d-flex flex-column mb-2">--}}
+                            {{--    <label class="m-0">{{ $formA['FormVars']['Title']['SeqNo'] }}</label>--}}
+                                {{--    <input type="text" id="seq-no-txt" class="rounded w-100" autocomplete="off">--}}
+                                {{--</div>--}}
+                            {{--<div class="d-flex flex-column mb-2">--}}
+                            {{--<label class="m-0">{{ $formA['FormVars']['Title']['BrandCode'] }}</label>--}}
+                                {{--<input type="text" id="brand-code-txt" class="rounded w-100" autocomplete="off">--}}
+                                {{--</div>--}}
                             <div class="d-flex flex-column mb-2">
                                 <label class="m-0">{{ $formA['FormVars']['Title']['Component'] }}</label>
                                 <input type="text" id="component-txt" class="rounded w-100" autocomplete="off">
@@ -46,16 +46,16 @@
                                 <label class="m-0">{{ $formA['FormVars']['Title']['Parameter'] }}</label>
                                 <input type="text" id="parameter-txt" class="rounded w-100" autocomplete="off">
                             </div>
-                            <div class="align-items-center mb-2 {{ $formA['FormVars']['Display']['IsOnUse'] }}">
-                                <input type="checkbox" tabindex="-1" value="1" class="text-center mr-1" id="is-on-use-check"> <label class="mb-0" for="is-on-use-check">{{ $formA['FormVars']['Title']['IsOnUse'] }}</label>
-                            </div>
-                            <div class="align-items-center mb-2 {{ $formA['FormVars']['Display']['IsDefault'] }}">
-                                <input type="checkbox" tabindex="-1" value="1" class="text-center mr-1" id="is-default-check"> <label class="mb-0" for="is-on-use-check">{{ $formA['FormVars']['Title']['IsDefault'] }}</label>
-                            </div>
-                            <div class="d-flex flex-column mb-2">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['SetupJson'] }}</label>
-                                <input type="text" id="setup-json-txt" class="rounded w-100" autocomplete="off">
-                            </div>
+                            {{--<div class="align-items-center mb-2 {{ $formA['FormVars']['Display']['IsOnUse'] }}">--}}
+                            {{--    <input type="checkbox" tabindex="-1" value="1" class="text-center mr-1" id="is-on-use-check"> <label class="mb-0" for="is-on-use-check">{{ $formA['FormVars']['Title']['IsOnUse'] }}</label>--}}
+                            {{--</div>--}}
+                                {{--<div class="align-items-center mb-2 {{ $formA['FormVars']['Display']['IsDefault'] }}">--}}
+                                    {{--    <input type="checkbox" tabindex="-1" value="1" class="text-center mr-1" id="is-default-check"> <label class="mb-0" for="is-on-use-check">{{ $formA['FormVars']['Title']['IsDefault'] }}</label>--}}
+                                    {{--</div>--}}
+                                        {{--<div class="d-flex flex-column mb-2">--}}
+                                            {{--    <label class="m-0">{{ $formA['FormVars']['Title']['SetupJson'] }}</label>--}}
+                                            {{--    <input type="text" id="setup-json-txt" class="rounded w-100" autocomplete="off">--}}
+                                                {{--</div>--}}
                         </div>
                     </div>
                 </div>
@@ -97,15 +97,15 @@
 
             PopupSetupFormAThemeSetupExampleForm.parameter = function () {
                 let setup = {
-                    SetupName:  $('#theme-setup-example-form').find('#setup-name-txt').val(),
-                    SetupCode:  $('#theme-setup-example-form').find('#setup-code-txt').val(),
-                    SeqNo:      $('#theme-setup-example-form').find('#seq-no-txt').val(),
-                    BrandCode:  $('#theme-setup-example-form').find('#brand-code-txt').val(),
+                    // SetupName:  $('#theme-setup-example-form').find('#setup-name-txt').val(),
+                    // SetupCode:  $('#theme-setup-example-form').find('#setup-code-txt').val(),
+                    // SeqNo:      $('#theme-setup-example-form').find('#seq-no-txt').val(),
+                    // BrandCode:  $('#theme-setup-example-form').find('#brand-code-txt').val(),
                     Component:  $('#theme-setup-example-form').find('#component-txt').val(),
                     Parameter:  $('#theme-setup-example-form').find('#parameter-txt').val(),
-                    IsOnUse:    $('#theme-setup-example-form').find('#is-on-use-check').is(':checked'),
-                    IsDefault:  $('#theme-setup-example-form').find('#is-default-check').is(':checked'),
-                    SetupJson:  $('#theme-setup-example-form').find('#setup-json-txt').val(),
+                    // IsOnUse:    $('#theme-setup-example-form').find('#is-on-use-check').is(':checked'),
+                    // IsDefault:  $('#theme-setup-example-form').find('#is-default-check').is(':checked'),
+                    // SetupJson:  $('#theme-setup-example-form').find('#setup-json-txt').val(),
                 }
                 let id = Number($('#theme-setup-example-form').find('#Id').val());
                 let parameter = {
@@ -121,12 +121,14 @@
                 } else {
                     delete parameter.UpdatedOn;
                 }
-                console.log(parameter);
+
+                console.log('save : ', parameter);
 
                 return parameter;
             }
 
             PopupSetupFormAThemeSetupExampleForm.show_popup_callback = async function (id, setup) {
+                console.log('show_popup_callback : ', setup);
                 $('#modal-select-popup.popup-setup-form-a-theme-setup-example-form .modal-dialog').css('maxWidth', '600px');
                 Atype.btn_act_new('#theme-setup-example-form #frm');
                 $('#theme-setup-example-form').find('#Id').val(id)
@@ -138,15 +140,15 @@
                 if (_.isEmpty(setup)) return
 
                 const theme_setup_example_form = $('#theme-setup-example-form')
-                $(theme_setup_example_form).find('#setup-name-txt').val(setup['SetupName'])
-                $(theme_setup_example_form).find('#setup-code-txt').val(setup['SetupCode'])
-                $(theme_setup_example_form).find('#seq-no-txt').val(setup['SeqNo'])
-                $(theme_setup_example_form).find('#brand-code-txt').val(setup['BrandCode'])
+                // $(theme_setup_example_form).find('#setup-name-txt').val(setup['SetupName'])
+                // $(theme_setup_example_form).find('#setup-code-txt').val(setup['SetupCode'])
+                // $(theme_setup_example_form).find('#seq-no-txt').val(setup['SeqNo'])
+                // $(theme_setup_example_form).find('#brand-code-txt').val(setup['BrandCode'])
                 $(theme_setup_example_form).find('#component-txt').val(setup['Component'])
                 $(theme_setup_example_form).find('#parameter-txt').val(setup['Parameter'])
-                $(theme_setup_example_form).find('#is-on-use-check').prop('checked', setup['IsOnUse'])
-                $(theme_setup_example_form).find('#is-default-check').prop('checked', setup['IsDefault'])
-                $(theme_setup_example_form).find('#setup-json-txt').val(setup['SetupJson'])
+                // $(theme_setup_example_form).find('#is-on-use-check').prop('checked', setup['IsOnUse'])
+                // $(theme_setup_example_form).find('#is-default-check').prop('checked', setup['IsDefault'])
+                // $(theme_setup_example_form).find('#setup-json-txt').val(setup['SetupJson'])
             }
 
         }( window.PopupSetupFormAThemeSetupExampleForm = window.PopupSetupFormAThemeSetupExampleForm || {}, jQuery ));