t

dabory/para/erp/ko_KR/popup/popup-setup/form-a/header-footer-html.json

@@ -0,0 +1,24 @@
+{
+    "General": {
+        "PickApi": "setup-pick",
+        "ActApi": "setup-act"
+    },
+    "SelectButtonOptions": [
+    ],
+
+    "//FormVars": "ListVars[0]-Caption, ListVars[1]-hidden",
+    "FormVars": [
+        {
+            "SaveButton": "저장",
+            "Header": "Header",
+            "Body": "Body",
+            "Footer": "Footer"
+        },
+        {
+            "SaveButton": "center",
+            "Header": "center",
+            "Body": "center",
+            "Footer": "center"
+        }
+    ]
+}

public/css/all.min.css

@@ -18,7 +18,6 @@
 --cyan-100:#eaf8fa;
 --gray:#999;
 --gray-dark:#333;
---gray-200:#ddd;
 --primary:#2196F3;
 --primary-100:#e9f5fe;
 --secondary:#45748a;
@@ -46,7 +45,6 @@
 --pink-100:#feeff3;
 --yellow:#ffd648;
 --yellow-100:#fffbed;
---black : #191919;
 --btn-basic : #46674e;
 --txt-hover : #1b1bdb;
 --txt-gray : #787878;
@@ -60,9 +58,7 @@
 --breakpoint-xl:1200px;
 --font-family : "Roboto", -apple-system, 'Noto Sans KR', sans-serif;"
 --font-family-sans-serif:"Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
---font-family-monospace:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-
---border :#ededed;
+--font-family-monospace:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace
 }
 *, ::after, ::before {
 	box-sizing: border-box
@@ -2379,8 +2375,6 @@ margin-right:.25rem;
 	margin-bottom: 0
 }
 }
-
-/*버튼*/
 .btn {
 	display: inline-block; height:36px;;
 	font-weight: 400;
@@ -2421,10 +2415,13 @@ border-radius:.25rem;
 a.btn.disabled, fieldset:disabled a.btn {
 	pointer-events: none
 }
+<<<<<<< HEAD
 
 .btn-group-sm>.btn, 
 .btn-sm {min-width: 3.250rem; padding: .3125rem .75rem; font-size: .8125rem; line-height: 1.6924; border-radius: .1875rem;}
 
+=======
+>>>>>>> refs/remotes/origin/master
 .btn-primary {
 	color: #fff;
 	background-color:#5c6bc0;
@@ -2955,16 +2952,6 @@ a.btn.disabled, fieldset:disabled a.btn {
 	background-color: #eee;
 	border-color: #ccc
 }
-.btn-gray-200 {
-	color: #666;
-	background-color:var(--gray-200);
-	border-color: var(--gray-200);;
-}
-.btn-gray-200 :hover {
-	color: #525252;
-	background-color: #999;
-	border-color: #999
-}
 .btn-indigo {
 	color: #fff;
 	background-color: #5c6bc0;
@@ -3829,8 +3816,6 @@ a.btn.disabled, fieldset:disabled a.btn {
 .btn-outline-yellow-100:not(:disabled):not(.disabled).active:focus, .btn-outline-yellow-100:not(:disabled):not(.disabled):active:focus, .show>.btn-outline-yellow-100:focus {
 	box-shadow: 0 0 0 0 rgba(255,251,237,.5)
 }
-.btn-outline-gray {color: #787878; background:#fff; border-color: #ddd;}
-.btn-outline-gray:hover {background-color: #f6f6f6;}
 .btn-link {
 	font-weight: 400;
 	color: #2196f3;
@@ -3853,7 +3838,13 @@ font-size:.9375rem;
 	line-height: 1.4667;
 border-radius:.3125rem
 }
-
+.btn-group-sm>.btn, .btn-sm {
+min-width:3.250rem;
+padding:.3125rem .75rem;
+font-size:.8125rem;
+	line-height: 1.6924;
+border-radius:.1875rem
+}
 .btn-block {
 	display: block;
 	width: 100%
@@ -29604,16 +29595,14 @@ body {
 	overflow-y: auto;
 	-webkit-overflow-scrolling: touch;
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> refs/remotes/origin/master
 @media (prefers-reduced-motion:no-preference) {
 .content-inner {
 	scroll-behavior: smooth
 }
-	.content-inner .blanker_item {
-		scroll-behavior: smooth
-	}
-
-
 }
 .layout-static, .layout-static .page-content, .layout-static body {
 	overflow: visible
@@ -31348,7 +31337,7 @@ input[type="text"].input_line {border:none; border-bottom:1px solid #000;}
 .taxbill .modal-footer dl {display:flex; align-items:center; margin-right:20px; }
 .taxbill .modal-footer dt {margin-right:5px; font-weight:700;}
 .taxbill .modal-footer dd {display:flex; align-items:center;}
-.taxbill .modal-footer .<i class="fas fa-window-close"></i> {display: flex; align-items: center; justify-content:center; width:28px; margin-left:3px; padding: 0 5px; font-size:11px;}
+.taxbill .modal-footer .btn-gray {display: flex; align-items: center; justify-content:center; width:28px; margin-left:3px; padding: 0 5px; font-size:11px;}
 .taxbill .modal-footer .btn_wrap {margin-left:auto;}
 .taxbill .modal-footer button {height:28px; padding:0 .75rem; border-radius:0;}
 
@@ -31542,6 +31531,7 @@ a:focus {    outline: 0;}
 
 .post-tabbed .tab-pane {padding:0.625rem 0;}
 
+<<<<<<< HEAD
 /*프린트 상품등록*/
 .blanker_item .btn-group-sm>.btn, 
 .blanker_item .btn-sm {height:32px; padding: 2px 0.625rem;/*.3125rem .75rem;*/ font-size: 13px; line-height:1; border-radius:5px;}
@@ -31697,13 +31687,10 @@ tbody input[type="text"].pw2 {width:44px!important;}
 .blanker_item .row_tb tr td {padding-left:12px; padding-right:12px;}
 .blanker_item .row_tb tr td td {padding-left:0; padding-right:0;}
 
+=======
+>>>>>>> refs/remotes/origin/master
 @media (max-width:1440px) {
 	.m_searchbox {max-width:30%;}
-
-	.blanker_item .guide,
-	.blanker_item .setsize_wrap,
-	.editor_wrap  > div,
-	.option_wrap  > div {margin-right:0;}
 }
 
 @media (max-width:1440px) and (min-width:1199.98px) {
@@ -31762,22 +31749,6 @@ tbody input[type="text"].pw2 {width:44px!important;}
 
 	.popup-form1-form-a-member-company-form .nav-tabs-solid .nav-link {padding: 0.3rem 20px;}
 	.popup-form1-form-a-member-company-form .mt_space {margin-top:0;}
-
-	#pheader1 > td:last-child > div ul {margin-left:60px; max-width:250px;}
-	.blanker_item .setsize_wrap {flex-direction:column!important; gap:0;}
-	.blanker_item .setsize_wrap > div:first-child:after {display:none;}
-	.blanker_item .set_size {margin-top:10px; padding-top:10px; border-top:1px dashed #ddd;}
-    .blanker_item .editor_wrap th,
-	.blanker_item .editor_wrap td {display:block; height:auto;}
-	.blanker_item .editor_wrap th {padding:18px 0 3px;}
-	.blanker_item .editor_wrap tr:first-of-type th {padding-top:0;}
-	.blanker_item .option_wrap > .card {padding:12px;}
-	.blanker_item .option_wrap .hu_cnts {position:relative; width:100%;}
-	.blanker_item .option_wrap .hu_cnts th,
-	.blanker_item .option_wrap .hu_cnts > tbody > tr > td {display:block; height:auto}
-	.blanker_item .option_wrap .hu_cnts > tbody > tr > td:last-child {position:absolute; top:-10px; right:-10px; padding-top:0!important;}
-	.blanker_item .option_wrap .hu_cnts th {padding:0 3px;}
-	.blanker_item .option_wrap .hu_cnts > tbody > tr > td table {width:100%;}
 }
 
 @media (max-width: 480px) {
@@ -31807,28 +31778,6 @@ tbody input[type="text"].pw2 {width:44px!important;}
 	.item_tabbed .anch{height:122px; margin-top:-122px;}
 	.item_tabbed .card-header {padding-left:0!important; padding-right:0!important;}
 	.item_tabbed .card-body {padding-left:10px; padding-right:10px;}
-
-	.blanker_item .guide {flex-direction:column; gap:20px;}
-	.blanker_item .nav-item {flex:1;}
-	.blanker_item .nav-link {justify-content: center; width: 100%; padding-left:10px; padding-right:10px;}
-	.blanker_item .set_size .stit {flex-direction:column; align-items: flex-start; gap: 0;}
-	.blanker_item .set_size ul {flex-direction:column; align-items: flex-start; gap: 0;}
-
-	.blanker_item .option_wrap > .card {padding:0;}
-	.blanker_item .option_wrap > .card .card { border:none; border-radius:0;}
-	.blanker_item .row_tb tr td td {display:block; width:100%; height:auto; padding:3px 0;}
-	.blanker_item .option_wrap .hu_cnts th {padding:10px; padding-bottom:0;}
-	.blanker_item .option_wrap .hu_cnts > tbody > tr > td:last-child {top:3px; right:0;}
-	.blanker_item .option_wrap .top_tb {margin-bottom:10px;}
-	.blanker_item .option_wrap .top_tb a.btn {position: absolute;  bottom: 3px;  right:-1px;}
-	.blanker_item .option_wrap .top_tb td {position: relative; display:block; height:auto; padding:20px 8px;}
-	.blanker_item .option_wrap .top_tb .btn_del {top:10px; right:10px;}
-	.blanker_item .option_wrap .row_tb tbody {display:block; height:auto;}	
-	.blanker_item .option_wrap .row_tb tr {display:block;}
-	.blanker_item .row_tb table {display:block; width:100%; padding-bottom:10px!important; margin-bottom:10px!important; border-bottom:1px dashed #ddd;}
-	.blanker_item .row_tb td  {display:block; width:100%; height:auto;}
-	.blanker_item .option_wrap .row_tb td span {display:inline-block; width:50px;}  
-    
 }
 
 @media (max-width: 380px) {

resources/views/front/dabory/erp/basic-settings/monthly-settle.blade.php

@@ -120,16 +120,24 @@
         }
 
         MonthlySettleForm.btn_re_cal = async function () {
-            // console.log('api_url', MonthlySettleForm.formA['General']['ActApi']);
+            if ($('#yyyy-txt').val() == '') {
+                return iziToast.error({ title: 'Error', message: '정산년도를 입력해주세요. ex)2024' });
+            }
+
             const parameters = MonthlySettleForm.parameter();
-            let data;
-            let response;
+
             for (const parameter of parameters) {
-                data = parameter;
-                response = await get_api_data('monthly-settle', data);
-                console.log('response : ', response);
+                const response = await get_api_data('monthly-settle', parameter);
+
+                if (response && response.data.apiStatus) {
+                    console.log(response);
+                    return iziToast.error({ title: 'Error', message: 'API Error' });
+                }
+
+                iziToast.success({ title: 'Success', message: '재정산 완료' });
+                console.log(response);
             }
-        }
+        };
 
     }( window.MonthlySettleForm = window.MonthlySettleForm || {}, jQuery ));
 

resources/views/front/dabory/erp/popup-setup/form-a/header-footer-html-form.blade.php

@@ -0,0 +1,134 @@
+{{-- @extends('layouts.master')
+@section('content') --}}
+
+<div id="popup-setup-form-a-header-footer-html-form">
+    <div class="mb-1 pt-2 text-right btn-groups">
+        <button type="button" class="btn btn-sm btn-primary save-spinner-btn">
+            <span class="save-spinner spinner-border spinner-border-sm text-center" role="status" aria-hidden="true"></span>
+                Loading...
+        </button>
+        <div class="btn-group" hidden>
+            <button type="button" class="btn btn-sm btn-primary header-footer-html-act save-button" data-value="save" {{ $formA['FormVars']['Hidden']['SaveButton'] }}>
+                {{ $formA['FormVars']['Title']['SaveButton'] }}
+            </button>
+            @isset($formA['SelectButtonOptions'])
+                @include('front.dabory.erp.partial.select-btn-options', [
+                    'selectBtns' => $formA['SelectButtonOptions'],
+                    'eventClassName' => 'header-footer-html-act',
+                ])
+            @endisset
+        </div>
+    </div>
+    <div class="card mb-2" id="header-footer-html-form">
+        <div class="card-header" id="frm">
+            <input type="hidden" id="Id" name="Id" value="0">
+            <input type="hidden" id="view-source-url">
+            <div class="row">
+                <div class="col-12 col-lg card-header-item">
+                    <div class="card card card-primary mb-3 mb-md-2 mb-lg-0 border-light">
+                        <div class="card-header p-0 mb-2">
+                        </div>
+                        <div class="card-body">
+                            <div class="d-flex flex-column mb-3">
+                                <label class="m-0">{{ $formA['FormVars']['Title']['Header'] }}</label>
+                                <textarea id="header-textarea"></textarea>
+                            </div>
+                            <div class="d-flex flex-column mb-3">
+                                <label class="m-0">{{ $formA['FormVars']['Title']['Body'] }}</label>
+                                <textarea id="body-textarea"></textarea>
+                            </div><div class="d-flex flex-column mb-3">
+                                <label class="m-0">{{ $formA['FormVars']['Title']['Footer'] }}</label>
+                                <textarea id="footer-textarea"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{-- @endsection --}}
+
+@once
+    <script>
+        $(document).ready(async function() {
+            $('#header-footer-html-form').find('#upload-file').fileselect()
+
+            $('.header-footer-html-act').on('click', function () {
+                // console.log($(this).data('value'))
+                switch( $(this).data('value') ) {
+                    case 'save': PopupSetupFormAHeaderFooterHtmlForm.btn_act_save(); break;
+                }
+            });
+
+            activate_button_group()
+        });
+
+        (function( PopupSetupFormAHeaderFooterHtmlForm, $, undefined ) {
+            PopupSetupFormAHeaderFooterHtmlForm.formA = {!! json_encode($formA) !!};
+            PopupSetupFormAHeaderFooterHtmlForm.brand_code
+
+
+            PopupSetupFormAHeaderFooterHtmlForm.btn_act_new_callback = function () {
+                Atype.btn_act_new('#header-footer-html-form #frm')
+            }
+
+            PopupSetupFormAHeaderFooterHtmlForm.btn_act_save = function () {
+                Atype.set_parameter_callback(PopupSetupFormAHeaderFooterHtmlForm.parameter);
+
+                Atype.btn_act_save('#header-footer-html-form #frm', function () {
+                    $('#modal-select-popup.show').trigger('list.requery')
+                    $('#modal-select-popup.show').modal('hide');
+                }, 'PopupSetupFormAHeaderFooterHtmlForm');
+            }
+
+            PopupSetupFormAHeaderFooterHtmlForm.parameter = function () {
+                const form = $('#header-footer-html-form')
+
+                let setup = {
+                    Header: $(form).find('#header-textarea').val(),
+                    Body: $(form).find('#body-textarea').val(),
+                    Footer: $(form).find('#footer-textarea').val(),
+                }
+                let id = Number($(form).find('#Id').val())
+                let parameter = {
+                    Id: id,
+                    SetupJson: JSON.stringify(setup),
+                }
+                if (id < 0) {
+                    parameter = { Id: id }
+                } else if (id > 0) {
+                    delete parameter.CreatedOn;
+                } else {
+                    delete parameter.UpdatedOn;
+                }
+
+                return parameter;
+            }
+
+            PopupSetupFormAHeaderFooterHtmlForm.btn_act_new = async function () {
+                Atype.btn_act_new('#header-footer-html-form #frm')
+            }
+
+            PopupSetupFormAHeaderFooterHtmlForm.show_popup_callback = async function (id, setup, brand_code) {
+                $('#modal-select-popup.popup-setup-form-a-header-footer-html-form .modal-dialog').css('maxWidth', '600px');
+                PopupSetupFormAHeaderFooterHtmlForm.btn_act_new()
+                $('#header-footer-html-form').find('#Id').val(id)
+                PopupSetupFormAHeaderFooterHtmlForm.brand_code = brand_code
+                PopupSetupFormAHeaderFooterHtmlForm.set_ui(setup)
+            }
+
+            PopupSetupFormAHeaderFooterHtmlForm.set_ui = function (setup) {
+                if (_.isEmpty(setup)) return;
+
+                const form = $('#header-footer-html-form')
+
+                $(form).find('#header-textarea').val(setup['Header'])
+                $(form).find('#body-textarea').val(setup['Body'])
+                $(form).find('#footer-textarea').val(setup['Footer'])
+            }
+
+        }( window.PopupSetupFormAHeaderFooterHtmlForm = window.PopupSetupFormAHeaderFooterHtmlForm || {}, jQuery ));
+    </script>
+@endonce

resources/views/front/dabory/erp/popup-setup/form-a/seo-html-form.blade.php

@@ -29,10 +29,7 @@
                         <div class="card-header p-0 mb-2">
                         </div>
                         <div class="card-body">
-                            <div class="d-flex flex-column mb-3">
-                                <label class="m-0">{{ $formA['FormVars']['Title']['PageHtml'] }}</label>
-                                <textarea id="page-html-textarea"></textarea>
-                            </div>
+
                             <div class="d-flex flex-column mb-3 common-seo-html">
                                 <label class="m-0">site-verification HTML & robots.txt (.xml, .txt .html ONLY)</label>
                                 <input type="file" id="upload-file" class="cursor-pointer rounded w-100 form-control-uniform-custom" style="text-indent: 0;"