hokky 4 months ago
parent
commit
0aaadd8fb3

+ 13 - 7
erp/para/ko_KR/list/list-type1/downupload/post/post-sise.json

@@ -6,10 +6,15 @@
     },
     },
 
 
     "QueryVars": {
     "QueryVars": {
+<<<<<<< HEAD
         "QueryName": "download/post/post-sise",
         "QueryName": "download/post/post-sise",
+=======
+        "QueryName": "kbgolf::download/post/post-sise",
+>>>>>>> 1d98ba5239f3d13d6e0b00c68a7da3513dac9678
         "FilterName": "",
         "FilterName": "",
         "FilterValue": "",
         "FilterValue": "",
-        "FilterDate": ""
+        "FilterDate": "mx.pc6",
+        "SimpleFilter": "mx.post_type_id=59"
     },
     },
 
 
     "HeadSelectOptions": [
     "HeadSelectOptions": [
@@ -29,7 +34,8 @@
             "Value": "dummy",
             "Value": "dummy",
             "Caption": "(2)적용",
             "Caption": "(2)적용",
             "Component": "kbgolf::popup.popup-form1.form-insert",
             "Component": "kbgolf::popup.popup-form1.form-insert",
-            "Parameter": "/popup/popup-form1/form-insert/sise"
+            "Parameter": "/popup/popup-form1/form-insert/sise",
+            "ThemeDir": "kbgolf/erp"
         }
         }
     ],
     ],
 
 
@@ -39,7 +45,7 @@
             "ListButton": "조회",
             "ListButton": "조회",
             "DateRange": "",
             "DateRange": "",
             "DateNavi": "이전 | (오늘지정) | 이후",
             "DateNavi": "이전 | (오늘지정) | 이후",
-            "Date": "자료 등록일",
+            "Date": "시세일자",
             "From": "부터",
             "From": "부터",
             "To": "까지",
             "To": "까지",
             "FirstRange": "",
             "FirstRange": "",
@@ -69,7 +75,7 @@
             "Caption": "회원권명"
             "Caption": "회원권명"
         },
         },
         {
         {
-            "Value": "mx.pc5",
+            "Value": "mx.pc1",
             "Caption": "회원권코드"
             "Caption": "회원권코드"
         },
         },
         {
         {
@@ -189,15 +195,15 @@
         "IsAddTotalLine": false,
         "IsAddTotalLine": false,
         "IsCache": true,
         "IsCache": true,
 
 
-
+        "IsDownloadList": true,
         "IsListFirst": true,
         "IsListFirst": true,
         "IsExcelColumn": true,
         "IsExcelColumn": true,
         "IsSelectPopupHidden": true,
         "IsSelectPopupHidden": true,
         "IsC1Popup": "1",
         "IsC1Popup": "1",
-        "InitLines": 10,
+        "InitLines": 15,
         "HeadHeight": "140",
         "HeadHeight": "140",
         "BodyHeight": "570",
         "BodyHeight": "570",
-        "InitDateRange" : "all"
+        "InitDateRange" : "day"
     },
     },
 
 
     "ThumbContainerVars": {
     "ThumbContainerVars": {

+ 1 - 1
erp/para/ko_KR/popup/popup-form1/form-insert/sise.json

@@ -25,7 +25,7 @@
     },
     },
 
 
     "InsertVars": {
     "InsertVars": {
-        "QueryName": "post/sise",
+        "QueryName": "kbgolf::post/sise",
         "InsertType": "bulk",
         "InsertType": "bulk",
         "//InsertType": "one-by-one",
         "//InsertType": "one-by-one",
         "PreProcess"  : "",
         "PreProcess"  : "",

+ 0 - 423
erp/resources/views/form-post/standard.blade.php

@@ -1,423 +0,0 @@
-<div class="mb-1 pt-2 text-right btn-groups">
-    <div class="btn-group">
-        <button type="button" class="btn btn-sm btn-primary standard-act save-button" data-value="save" {{ $formPost['FormPostVars']['Hidden']['SaveButton'] }}>
-            {{ $formPost['FormPostVars']['Title']['SaveButton'] }}
-        </button>
-        @include('front.dabory.erp.partial.select-btn-options', [
-            'selectBtns' => $formPost['SelectButtonOptions'],
-            'eventClassName' => 'standard-act',
-        ])
-    </div>
-
-    <button type="button" id="modal-media-btn" hidden
-            class="btn btn-success btn-open-modal">
-    </button>
-</div>
-
-<div class="card mb-0 pb-0" id="standard-form">
-    <div class="row m-1" id="frm">
-        <input type="hidden" id="Id" name="Id" value="0">
-        <input type="hidden" id="attached-files">
-        @php
-            $collection = collect($formPost['FormPostVars']['Title']);
-            $chunk = $collection->splice($formPost['DisplayVars']['Chunk'] + 1);
-            if ($formPost['DisplayVars']['Chunk'] == 999) {
-                $cardWidth = [12, 0];
-            } else {
-                $cardWidth = [8, 4];
-            }
-        @endphp
-        @foreach([$collection->all(), $chunk->all()] as $key => $chunk)
-            <div class="{{ 'col-md-'.$cardWidth[$key] }} col-12 card-header-item px-0">
-                <div class="card card-primary mb-1 mb-md-0 mb-lg-0 border-light">
-                    <div class="card-header p-0 mb-2"></div>
-
-                    <div class="card-body">
-                        @if($key === 1)
-                        <div class="form-group d-flex flex-column">
-                            <div class="d-flex align-items-center">
-                                <label class="m-0 mr-1">첨부화일들(이전 업로드 파일 복구 불가)</label>
-                                <button @click="addItem"><i class="fas fa-plus"></i></button>
-                            </div>
-                            <div class="d-flex align-items-center mb-2" v-for="(item, index) in attachedFiles">
-                                <input type="file" @change="handleFileChange(index)"
-                                       class="cursor-pointer rounded w-100 form-control-uniform-custom mr-1" style="text-indent: 0;">
-                                <button @click="removeItem(index)"><i class="fas fa-minus"></i></button>
-                            </div>
-                        </div>
-                        @endif
-
-                        @foreach($chunk as $key => $title)
-                            @empty ($formPost['FormPostVars']['Ui'][$key]) @continue @endempty
-                            <div class="form-group d-flex flex-column mb-2">
-                                <label class="m-0">{{ $title }}</label>
-                            @switch($formPost['FormPostVars']['Ui'][$key])
-                                @case('postType')
-                                    <select id="{{ $key }}" class="rounded w-100"
-                                            maxlength="{{ $formPost['FormPostVars']['MaxLength'][$key] }}"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    </select>
-                                    @break
-                                @case('select')
-                                    <select id="{{ $key }}" class="rounded w-100"
-                                            maxlength="{{ $formPost['FormPostVars']['MaxLength'][$key] }}"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-
-                                        @foreach($formPost[$formPost['FormPostVars']['Format'][$key]] as $option)
-                                        <option value="{{ $option['Value'] }}">{{ DataConverter::execute(null, $option['Caption']) ?? $option['Caption'] }}</option>
-                                        @endforeach
-                                    </select>
-                                    @break
-                                @case('checkbox')
-                                    <input type="checkbox" id="{{ $key }}" class="rounded" value="1"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    @break
-                                @case('text')
-                                    <input type="text" id="{{ $key }}" class="rounded w-100" autocomplete="off"
-                                           maxlength="{{ $formPost['FormPostVars']['MaxLength'][$key] }}"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    @break
-                                @case('date')
-                                    <input type="date" id="{{ $key }}" class="rounded w-100"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    @break
-                                @case('time')
-                                    <input type="time" id="{{ $key }}" class="rounded w-100"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    @break
-                                @case('datetime')
-                                    <input type="text" id="{{ $key }}" name="datetime" class="rounded w-100"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                    @break
-                                @case('editor')
-                                    <div id="modal-memo">
-                                        @include('components.web-editor')
-                                    </div>
-                                    @break
-                                @case('textarea')
-                                    <textarea id="{{ $key }}" maxlength="{{ $formPost['FormPostVars']['MaxLength'][$key] }}"
-                                        {{ $formPost['FormPostVars']['Required'][$key] }}></textarea>
-                                    @break
-                                @case('media')
-                                    <div class="d-flex">
-                                        <input type="hidden" id="{{ $key }}">
-                                        <input type="text" id="{{ $key . '-file-path' }}" class="rounded w-100 radius-r0" autocomplete="off"
-                                               maxlength="{{ $formPost['FormPostVars']['MaxLength'][$key] }}"
-                                            {{ $formPost['FormPostVars']['Required'][$key] }}>
-                                        <button class="text-white rounded border-0 radius-l0 col-3 bg-green-600 border-green-600" onclick="FormPostStandard.show_media_modal()">찾기</button>
-                                    </div>
-                                    <div class="form-post-title">
-                                        <div class="form-post-img-div">
-                                            <img id="{{ $key . '-img' }}" class="mt-2 form-post-img" src="">
-                                        </div>
-                                    </div>
-                                @break
-                                @default
-                            @endswitch
-                            </div>
-                        @endforeach
-
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-</div>
-
-<div class="pt-0 mt-1 text-right btn-groups">
-    <div class="btn-group">
-        <button type="button" class="btn btn-sm btn-primary standard-act save-button" data-value="save" {{ $formPost['FormPostVars']['Hidden']['SaveButton'] }}>
-            {{ $formPost['FormPostVars']['Title']['SaveButton'] }}
-        </button>
-        @include('front.dabory.erp.partial.select-btn-options', [
-            'selectBtns' => $formPost['SelectButtonOptions'],
-            'eventClassName' => 'standard-act',
-        ])
-    </div>
-</div>
-
-@once
-@push('js')
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
-<script src="{{ csset('/js/modals-controller/a-type/common.js') }}"></script>
-<script src="{{ csset('/js/components/web-editor.js') }}"></script>
-    <script>
-        const AttachedFiles = new Vue({
-            el: '#standard-form',
-
-            data: function () {
-                return {
-                    attachedFiles: [null],
-                };
-            },
-
-            computed: {
-            },
-
-            mounted () {
-            },
-
-            methods: {
-                addItem: function () {
-                    this.attachedFiles.push(null)
-                },
-
-                removeItem: function (index) {
-                    return this.attachedFiles.splice(index, 1)
-                },
-
-                handleFileChange: function (index) {
-                    const file = event.target.files[0]; // 파일 선택을 받아옴
-                    this.$set(this.attachedFiles, index, file); // 파일을 배열에 추가
-                },
-
-                save: function () {
-                    console.log(this.attachedFiles)
-                    if (this.attachedFiles.length <= 0 || this.attachedFiles[0] === null) {
-                        return Atype.btn_act_save('#standard-form #frm', function () {
-                            $('#modal-select-popup.show').trigger('list.requery');
-                            $('#modal-select-popup.show').modal('hide');
-                        }, 'FormPostStandard');
-                    }
-
-                    let form = new FormData();
-                    form.append('_token', $('meta[name="csrf-token"]').attr('content'))
-                    form.append('fileCount', this.attachedFiles.length)
-                    this.attachedFiles.forEach((file, index) => {
-                        form.append('file' + index, file)
-                    })
-                    $.ajax({
-                        url: "/post-attached-files",
-                        type:'POST',
-                        data: form,
-                        processData: false,
-                        contentType: false,
-                        success: function(data) {
-                            $('#attached-files').val(data)
-                            Atype.btn_act_save('#standard-form #frm', function () {
-                                $('#modal-select-popup.show').trigger('list.requery');
-                                $('#modal-select-popup.show').modal('hide');
-                            }, 'FormPostStandard');
-                        },
-                    });
-                }
-            }
-        });
-
-        $(document).ready(async function() {
-            let query = ''
-            const postCode = FormPostStandard.formA['General']['PostCode']
-            if (postCode) {
-                query = `post_code='${postCode}'`
-                if (postCode === 'integrated') {
-                    query = `sort = '400'`
-                }
-            }
-            const response = await get_api_data('post-type-page', {
-                PageVars: {
-                    Query: query,
-                    Limit: 100
-                }
-            })
-            $('#PostTypeId').html(window.custom_create_options('Id', 'TypeTitle', response.data.Page));
-
-            mediaModal = await include_media_library('media-body', 'post')
-
-            $('input[name="datetime"]').daterangepicker({
-                locale: {
-                    applyLabel: "확인",
-                    cancelLabel: "취소",
-                    daysOfWeek: ["일", "월", "화", "수", "목", "금", "토"],
-                    monthNames: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
-                    format: "YYYY-MM-DD HH:mm:ss"
-                },
-                drops: 'auto',
-                timePicker24Hour: true,
-                timePicker: true,
-                singleDatePicker: true,
-                showDropdowns: true,
-                applyButtonClasses: "btn-apply"
-            });
-
-            $('#dbupdate-form').find('#dbupdate-date').val(date_to_sting(new Date()))
-
-            $('.standard-act').on('click', function () {
-                switch( $(this).data('value') ) {
-                    case 'save': AttachedFiles.save(); break;
-                    case 'del': FormPostStandard.btn_act_del(); break;
-                    case 'copy': FormPostStandard.btn_act_copy(); break;
-                    case 'new': FormPostStandard.btn_act_new(); break;
-                }
-            });
-
-            $(document).on('file.paste', '#modal-media', function (event, file_url_list, id_list) {
-                $('#MediaId').val(id_list[0])
-                FormPostStandard.set_featured_image(file_url_list[0])
-            });
-        });
-
-        (function( FormPostStandard, $, undefined ) {
-            FormPostStandard.formA = {!! json_encode($formPost) !!}
-
-            FormPostStandard.show_media_modal = function () {
-                $('#modal-media').data('target-id', '')
-                PopupForm1FormBMediaForm.btn_act_new();
-                $('#modal-media-btn').data('target', 'media')
-                $('#modal-media-btn').data('variable', mediaModal)
-                $('#modal-media-btn').trigger('click')
-            }
-
-            FormPostStandard.set_featured_image = function (file_path) {
-                $('#MediaId-file-path').val(file_path)
-                $('#MediaId-img').attr('src', window.env['MEDIA_URL'] + file_path)
-                $('#MediaId-img').prop('hidden', false)
-            }
-
-            FormPostStandard.btn_act_del = function () {
-                Atype.btn_act_del('#standard-form #frm', function () {
-                    $('#modal-select-popup.show').trigger('list.requery');
-                    $('#modal-select-popup.show').modal('hide');
-                }, 'FormPostStandard')
-            }
-
-            FormPostStandard.btn_act_copy = function () {
-                Atype.btn_act_copy('#standard-form #frm', function () {
-                    $('#modal-select-popup.show').trigger('list.requery');
-                    $('#modal-select-popup.show').modal('hide');
-                }, 'FormPostStandard')
-            }
-
-            FormPostStandard.btn_act_new = function () {
-                $('#modal-select-popup .modal-body button').removeClass('bg-grey-700 border-grey-700 bg-grey-700-hover')
-                $('#modal-select-popup .modal-body thead th').removeClass('bg-grey-700')
-                $('#modal-select-popup .modal-header').removeClass('bg-grey-700')
-
-                $('#modal-select-popup .modal-header').addClass('bg-green-600 border-green-600')
-                $('#modal-select-popup .modal-body .btn-group > button').addClass('bg-green-600 border-green-600 bg-green-600-hover')
-
-                $('#modal-select-popup.form-post-standard .modal-dialog').css('maxWidth', FormPostStandard.formA['DisplayVars']['Width'] + 'px');
-                Atype.set_parameter_callback(FormPostStandard.parameter)
-
-                $('#MediaId-img').attr('src', '')
-                $('#MediaId-img').prop('hidden', true)
-
-                $('#standard-form').find('.fr-view').html('')
-                Atype.btn_act_new('#standard-form #frm')
-
-                AttachedFiles.attachedFiles = [ null ]
-            }
-
-            FormPostStandard.parameter = function () {
-                const id = Number($('#standard-form').find('#Id').val())
-                let parameter = { Id: id, UserId: window.User['UserId'], AttachedFiles: $('#attached-files').val() }
-
-                for (const key in FormPostStandard.formA['FormPostVars']['Title']) {
-                    if (isEmpty(FormPostStandard.formA['FormPostVars']['Type'][key])) { continue }
-
-                    let result
-                    const value = $('#standard-form').find(`#${key}`).val()
-                    const format = FormPostStandard.formA['FormPostVars']['Type'][key]
-                    switch (format) {
-                        case 'YYYY-MM-DD': case 'YYYY.MM.DD': case 'YYYYMMDD':
-                        case 'YY-MM-DD': case 'YY.MM.DD': case 'YYMMDD':
-                        case 'yy-mm-dd': case 'yy.mm.dd': case 'yymmdd':
-                            result = moment(value).format(format);
-                            break;
-                        case 'string':
-                            result = String(value)
-                            break;
-                        case 'number':
-                            result = Number(value)
-                            break;
-                        case 'check':
-                            result = $('#standard-form').find(`#${key}`).prop('checked') ? '1': '0'
-                            break;
-                        case 'editor':
-                            const editor = new FroalaEditor("#standard-form #froala-editor", { key: window.env['FROALA_LICENSE_KEY'], attribution: false })
-                            if (editor.codeView.isActive()) {
-                                result = editor.codeView.get()
-                                editor.codeView.toggle()
-                            } else {
-                                result = editor.html.get()
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-
-                    parameter[key] = result
-                }
-
-                if (id < 0) {
-                    parameter = { Id: id }
-                }
-
-                console.log(parameter)
-                return parameter;
-            }
-
-            FormPostStandard.btn_act_new_callback = function () {
-                FormPostStandard.btn_act_new()
-                Atype.set_parameter_callback(FormPostStandard.parameter);
-            }
-
-            FormPostStandard.show_popup_callback = async function (id, c1) {
-                FormPostStandard.btn_act_new()
-                await FormPostStandard.fetch_standard(Number(id));
-            }
-
-            FormPostStandard.fetch_standard = async function (id) {
-                let response = await get_api_data(FormPostStandard.formA['General']['PickApi'], {
-                    QueryVars: {
-                        QueryName: FormPostStandard.formA['General']['QueryName'],
-                        SimpleFilter: `mx.id=${id}`
-                    },
-                    PageVars: {
-                        Limit: 1
-                    }
-                })
-                // console.log(response)
-
-                FormPostStandard.set_standard_ui(response)
-            }
-
-            FormPostStandard.set_standard_ui = async function (response) {
-                if (isEmpty(response.data) || response.data.apiStatus) return;
-                let post = response.data.Page[0];
-                if (post['MediaId']) {
-                    const response = await get_api_data('media-pick', {
-                        Page: [ { Id: Number(post['MediaId']) } ]
-                    })
-
-                    const page = response.data['Page']
-                    if (page) {
-                        const file_url = page[0]['FileUrl']
-                        FormPostStandard.set_featured_image(file_url)
-                    }
-
-                }
-
-                console.log(post)
-                $('#standard-form').find('#Id').val(post.Id)
-                $('#standard-form').find('#attached-files').val(post.AttachedFiles)
-                for (const key in FormPostStandard.formA['FormPostVars']['Title']) {
-                    if (isEmpty(FormPostStandard.formA['FormPostVars']['Ui'][key])) { continue }
-
-                    if (FormPostStandard.formA['FormPostVars']['Ui'][key] === 'editor') {
-                        $('#standard-form').find('.fr-view').html(post[key])
-                    } else if (FormPostStandard.formA['FormPostVars']['Ui'][key] === 'checkbox') {
-                        $('#standard-form').find(`#${key}`).prop('checked', post[key] === '1')
-                    } else {
-                        let value = format_conver_for(post[key], FormPostStandard.formA['FormPostVars']['Format'][key])
-                        $('#standard-form').find(`#${key}`).val(value)
-                    }
-                }
-            }
-
-        }( window.FormPostStandard = window.FormPostStandard || {}, jQuery ));
-
-        let mediaModal
-    </script>
-@endpush
-@endonce

+ 5 - 6
erp/resources/views/popup/popup-form1/form-a/post/sise-form.blade.php

@@ -150,11 +150,11 @@
                     Id: id,
                     Id: id,
                     PostTypeId: 59,
                     PostTypeId: 59,
                     PostTitle: $(sise_form).find('#membership-name-txt').val(),
                     PostTitle: $(sise_form).find('#membership-name-txt').val(),
-                    Pc1: $(sise_form).find('input[name=sisetype]:checked').val(),
+                    Pc5: $(sise_form).find('input[name=sisetype]:checked').val(),   //
                     Pc2: $(sise_form).find('#area-select').val(),
                     Pc2: $(sise_form).find('#area-select').val(),
                     Pc3: $(sise_form).find('#today-price-txt').val(),
                     Pc3: $(sise_form).find('#today-price-txt').val(),
                     Pc4: $(sise_form).find('#yesterday-price-txt').val(),
                     Pc4: $(sise_form).find('#yesterday-price-txt').val(),
-                    Pc5: $(sise_form).find('#membership-code-txt').val(),
+                    Pc1: $(sise_form).find('#membership-code-txt').val(),
                 }
                 }
                 if (id < 0) {
                 if (id < 0) {
                     parameter = { Id: id }
                     parameter = { Id: id }
@@ -164,7 +164,6 @@
             }
             }
 
 
             PopupPopupForm1FormAPostSiseForm.fetch_sise = async function (id) {
             PopupPopupForm1FormAPostSiseForm.fetch_sise = async function (id) {
-                console.log('fetch_sise_id : ', id);
                 const response = await get_api_data(PopupPopupForm1FormAPostSiseForm.formA['General']['PickApi'], {
                 const response = await get_api_data(PopupPopupForm1FormAPostSiseForm.formA['General']['PickApi'], {
                     Page: [ { Id: id } ]
                     Page: [ { Id: id } ]
                 })
                 })
@@ -207,13 +206,13 @@
                 const sise_form = $('#sise-form')
                 const sise_form = $('#sise-form')
                 $(sise_form).find('#Id').val(sise.Id)
                 $(sise_form).find('#Id').val(sise.Id)
                 $(sise_form).find('#membership-name-txt').val(sise.PostTitle)
                 $(sise_form).find('#membership-name-txt').val(sise.PostTitle)
-                $(sise_form).find(`input[name='sisetype'][value='${sise.Pc1}']`).prop('checked', true)
+                $(sise_form).find(`input[name='sisetype'][value='${sise.Pc5}']`).prop('checked', true)
                 $(sise_form).find('#area-select').val(sise.Pc2)
                 $(sise_form).find('#area-select').val(sise.Pc2)
                 $(sise_form).find('#today-price-txt').val(sise.Pc3)
                 $(sise_form).find('#today-price-txt').val(sise.Pc3)
                 $(sise_form).find('#yesterday-price-txt').val(sise.Pc4)
                 $(sise_form).find('#yesterday-price-txt').val(sise.Pc4)
-                $(sise_form).find('#membership-code-txt').val(sise.Pc5)
+                $(sise_form).find('#membership-code-txt').val(sise.Pc1)
 
 
-                PopupPopupForm1FormAPostSiseForm.change_option(sise.Pc1, sise.Pc2);
+                PopupPopupForm1FormAPostSiseForm.change_option(sise.Pc5, sise.Pc2);
             }
             }
 
 
         }( window.PopupPopupForm1FormAPostSiseForm = window.PopupPopupForm1FormAPostSiseForm || {}, jQuery ));
         }( window.PopupPopupForm1FormAPostSiseForm = window.PopupPopupForm1FormAPostSiseForm || {}, jQuery ));

+ 0 - 127
pro/app/Http/Controllers/Auth/SocialTalkController copy.php

@@ -1,127 +0,0 @@
-<?php
-namespace Themes\kbgolf\pro\app\Http\Controllers\Auth;
-
-
-use App\Http\Controllers\Controller;
-use App\Services\CallApiService;
-use App\Services\DbUpdateService;
-use Illuminate\Support\Facades\Redirect;
-use SocialiteProviders\Apple\Provider;
-use Laravel\Socialite\Facades\Socialite;
-use Laravel\Socialite\Two\GoogleProvider;
-use Laravel\Socialite\Two\FacebookProvider;
-use SocialiteProviders\Kakao\KakaoProvider;
-use App\Providers\Socialite\OAuth2\DaboryProvider;
-use SocialiteProviders\Naver\Provider as NaverProvider;
-
-class SocialTalkController extends Controller
-{
-    private $callApiService;
-    private $dbUpdateService;
-    private $appleTokenService;
-    private $oauth2Info;
-    private $target;
-
-
-    public function __construct(CallApiService $callApiService, DbUpdateService $dbUpdateService)
-    {
-        $this->callApiService = $callApiService;
-        $this->dbUpdateService = $dbUpdateService;
-    }
-
-    public function redirectToProvider($provider)
-    {
-        // dd($provider);
-        $this->oauth2Info = request('oauth2Info');
-        // dump($this->oauth2Info);
-        return $this->setConfig($provider, request('target'))->redirect();
-    }
-
-    public function login($provider)
-    {
-        [$this->target, $ssoBrand] = explode('-', $provider);
-        $response = $this->callApiService->callApi([
-            'url' => 'setup-page',
-            'data' => [
-                'PageVars' => [
-                    'Query' => "(setup_code = 'sso-client' and brand_code = '{$provider}') and is_on_use = '1'",
-                    'Limit' => 100
-                ]
-            ],
-        ]);
-        // dd($response);
-
-        $this->oauth2Info = json_decode($response['Page'][0]['SetupJson'], true);
-        // $loginRoute = $this->target == 'member' ? 'member-login' : 'user-login';
-
-        try {
-            $userSocial = $this->setConfig($ssoBrand, $this->target)->user();
-        } catch (Exception $e) {
-            return redirect()->route($loginRoute)->with(['mgs' => $e->getMessage()]);
-        }
-
-        if ($this->target == 'member') {
-            if (strpos($provider, 'naver') !== false) {
-                // return redirect()->route('member-signup.index')->with('socialEmail', $user['email']);
-                // $redirectUrl = getLoginRedirectUrl($this->oauth2Info['AfterMemberLoginUri']);
-                // return redirect()->to($redirectUrl);
-                // $naverTalkUrl = 'https://talk.naver.com/ct/w5ubd2'; // 예시 URL, 실제로는 생성된 URL로 대체해야 합니다.
-                // // 로그인 완료 후 팝업으로 열기 위한 JavaScript 반환
-                // return view('views.layouts.master')->with('naverTalkUrl', $naverTalkUrl);
-                return Redirect::away('https://talk.naver.com/ct/w5ubd2');
-            }elseif(strpos($provider, 'kakao') !== false){
-                // $kakaoChatUrl = 'https://pf.kakao.com/_aAAGj/chat';
-                // return view('views.index')->with('kakaoChatUrl', $kakaoChatUrl);
-                return Redirect::away('https://pf.kakao.com/_aAAGj/chat');
-                // return redirect()->route('member-signup.index')->with('socialEmail', $user['email']);
-                // $redirectUrl = getLoginRedirectUrl($this->oauth2Info['AfterMemberLoginUri']);
-                // return redirect()->to($redirectUrl);
-            }
-        }
-    }
-
-    public function setConfig($provider, $target)
-    {
-        // dd($target);
-        $config = [
-            'client_id' => $this->oauth2Info['ClientId'],
-            'client_secret' => $this->oauth2Info['ClientSecret'],
-            'redirect' => "/social/$target-$provider/callback"
-        ];
-        // dd($config);
-        switch ($provider) {
-            case 'dabory':
-                $driver = Socialite::buildProvider(DaboryProvider::class, [
-                    'client_id' => config('app.api.main.ClientId'),
-                    'client_secret' => config('app.api.main.ClientSecret'),
-                    'redirect' => $config['redirect']
-                ]);
-                break;
-            case 'facebook':
-                $driver = Socialite::buildProvider(FacebookProvider::class, $config);
-                break;
-            case 'kakao':
-                $driver = Socialite::buildProvider(KakaoProvider::class, $config);
-                break;
-            case 'google':
-                $driver = Socialite::buildProvider(GoogleProvider::class, $config);
-                break;
-            case 'naver':
-                $driver = Socialite::buildProvider(NaverProvider::class, $config);
-                break;
-            case 'apple':
-
-                $config['client_secret'] = $this->appleTokenService->generate(
-                    $this->oauth2Info['PrivateKey'],
-                    $this->oauth2Info['ClientId'],
-                    $this->oauth2Info['TeamId'],
-                    $this->oauth2Info['KeyId'],
-                );
-
-                $driver = Socialite::buildProvider(Provider::class, $config);
-                break;
-        }
-
-        return $driver;
-    }
-}

+ 1 - 2
pro/app/Http/Controllers/Page/ContactUsCustomController.php

@@ -33,7 +33,6 @@ class ContactUsCustomController extends Controller
 
 
     public function index($id=null)
     public function index($id=null)
     {
     {
-        [$oauth2InfoList, $develLoginInfo] = setupSsoClientOrLoginInfo('member');
         $query = "post_type_id = 58";
         $query = "post_type_id = 58";
         $limit = (int)request('limit', 12);
         $limit = (int)request('limit', 12);
         $page = (int)request('page', 1);
         $page = (int)request('page', 1);
@@ -92,7 +91,7 @@ class ContactUsCustomController extends Controller
             ['path' => request()->url()]
             ['path' => request()->url()]
         );
         );
 
 
-        return view('views.page.contactus-custom-list', compact('contactUsCustomList', 'contactUsCustomItems', 'oauth2InfoList'));
+        return view('views.page.contactus-custom-list', compact('contactUsCustomList', 'contactUsCustomItems'));
     }
     }
 
 
     public function store()
     public function store()

File diff suppressed because it is too large
+ 0 - 0
pro/para/ko_KR/response/list-type1/home-book.json


+ 60 - 19
pro/resources/views/index.blade.php

@@ -44,16 +44,20 @@
 </div>
 </div>
 <!--// 회원권 매매 신청 끝 -->
 <!--// 회원권 매매 신청 끝 -->
 
 
+
+@php $today = date('Y-m-d'); @endphp
 <!-- 시세 시작 -->
 <!-- 시세 시작 -->
 <div class="m_quote">
 <div class="m_quote">
 	<div class="container">
 	<div class="container">
+        <div class="tabs today">
+            <input type="date" id="search_date" value="{{$today}}" autocomplete="off">
+        </div>
 		<ul class="tabs nav nav-tabs">
 		<ul class="tabs nav nav-tabs">
 			<li class="active"><a data-toggle="tab" data-sise="golf" href="#" onclick="changeSiseList(this)">골프 시세</a></li>
 			<li class="active"><a data-toggle="tab" data-sise="golf" href="#" onclick="changeSiseList(this)">골프 시세</a></li>
 			<li><a data-toggle="tab" href="#" data-sise="condo" onclick="changeSiseList(this)">콘도 시세</a></li>
 			<li><a data-toggle="tab" href="#" data-sise="condo" onclick="changeSiseList(this)">콘도 시세</a></li>
 			<li><a data-toggle="tab" href="#" data-sise="fitness" onclick="changeSiseList(this)">휘트니스 시세</a></li>
 			<li><a data-toggle="tab" href="#" data-sise="fitness" onclick="changeSiseList(this)">휘트니스 시세</a></li>
 		</ul>
 		</ul>
 		<div class="tab-content">
 		<div class="tab-content">
-			<!-- 골프 -->
 			<div id="golf" class="tab-pane fade in active show">
 			<div id="golf" class="tab-pane fade in active show">
 				<div class="tb_res tb_vertical">
 				<div class="tb_res tb_vertical">
 					<table cellspacing="0" cellpadding="0">
 					<table cellspacing="0" cellpadding="0">
@@ -134,40 +138,54 @@
 <!--// 블로그 끝 -->
 <!--// 블로그 끝 -->
 
 
 <script>
 <script>
-currentSiseType = 'golf';
+var currentSiseType = 'golf';
+var filteredSiseList = [];
 $(document).ready(function() {
 $(document).ready(function() {
+    var date = dateFormat(document.getElementById('search_date').value);
+    console.log('date: ', date);
+    filteredSiseList = searchDate(date, currentSiseType);
+    renderMainSiseList(filteredSiseList);
+
+    // console.log('초기값 : ', filteredSiseList);
     // console.log('mainYoutubeList : ',mainYoutubeList);
     // console.log('mainYoutubeList : ',mainYoutubeList);
     // 필터링된 리스트를 렌더링하는 함수 호출
     // 필터링된 리스트를 렌더링하는 함수 호출
-    changeSiseListByDefault(currentSiseType);
+    // changeSiseListByDefault(currentSiseType);
 	$('.main-header').addClass('main_header');
 	$('.main-header').addClass('main_header');
 	$('.main-header .logo img').attr("src", "/themes/kbgolf/pro/resources/images/logo_wh.png");
 	$('.main-header .logo img').attr("src", "/themes/kbgolf/pro/resources/images/logo_wh.png");
 });
 });
 
 
+document.getElementById('search_date').addEventListener('change', function() {
+    var date = dateFormat(document.getElementById('search_date').value);
+    console.log('date: ', date);
+    //currentSiseType = $(e).attr('data-sise');
+    filteredSiseList = searchDate(date, currentSiseType);
+    // console.log('filteredSiseList : ', filteredSiseList);
+    renderMainSiseList(filteredSiseList);
+});
+
 // siseType별로 tbody 생성
 // siseType별로 tbody 생성
 function changeSiseList(e) {
 function changeSiseList(e) {
-    // 다른 li태그 active class 제거
     $('.tabs li').removeClass('active');
     $('.tabs li').removeClass('active');
-    // 클릭한 태그의 li active class 추가
     $(e).parent().addClass('active');
     $(e).parent().addClass('active');
 
 
     currentSiseType = $(e).attr('data-sise');
     currentSiseType = $(e).attr('data-sise');
-    var filteredSiseList = mainSiseList.filter(function(mainsise) {
+    filteredSiseList_with_sise = filteredSiseList.filter(function(mainsise) {
         return mainsise['Pc5'].includes(currentSiseType);
         return mainsise['Pc5'].includes(currentSiseType);
     });
     });
 
 
-    renderMainSiseList(filteredSiseList);
+    renderMainSiseList(filteredSiseList_with_sise);
     // sise 더보기 버튼 list를 change할 때마다 활성화
     // sise 더보기 버튼 list를 change할 때마다 활성화
     $('.m_quote .btn_wrap .m_more').show();
     $('.m_quote .btn_wrap .m_more').show();
 }
 }
 // defalut 가져오기
 // defalut 가져오기
-function changeSiseListByDefault(currentSiseType) {
-    var filteredSiseList = mainSiseList.filter(function(mainsise) {
-        return mainsise['Pc5'].includes(currentSiseType);
-    });
-    renderMainSiseList(filteredSiseList);
-    // sise 더보기 버튼 list를 change할 때마다 활성화
-    $('.m_quote .btn_wrap .m_more').show();
-}
+// function changeSiseListByDefault(currentSiseType) {
+//     filteredSiseList_with_sise = filteredSiseList.filter(function(mainsise) {
+//         return mainsise['Pc5'].includes(currentSiseType);
+//     });
+//     renderMainSiseList(filteredSiseList_with_sise);
+//     // sise 더보기 버튼 list를 change할 때마다 활성화
+//     $('.m_quote .btn_wrap .m_more').show();
+// }
 
 
 // tbody 생성
 // tbody 생성
 function renderMainSiseList(siseList){
 function renderMainSiseList(siseList){
@@ -205,8 +223,8 @@ function renderMainSiseList(siseList){
             <td data-label="상담신청">
             <td data-label="상담신청">
                 <button type="button" class="btn consult-btn"
                 <button type="button" class="btn consult-btn"
                     data-post-title="${sise['PostTitle']}"
                     data-post-title="${sise['PostTitle']}"
-                    data-pc1="${sise['Pc1']}"
-                    onclick="window.location.href = '/contactus-custom/${sise['Pc1']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
+                    data-pc5="${sise['Pc5']}"
+                    onclick="window.location.href = '/contactus-custom/${sise['Pc5']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
                 </button>
                 </button>
             </td>
             </td>
         `);
         `);
@@ -319,8 +337,8 @@ function renderMainSiseList(siseList){
                 <td data-label="상담신청">
                 <td data-label="상담신청">
                     <button type="button" class="btn consult-btn"
                     <button type="button" class="btn consult-btn"
                             data-post-title="${sise['PostTitle']}"
                             data-post-title="${sise['PostTitle']}"
-                            data-pc1="${sise['Pc1']}"
-                            onclick="window.location.href = '/contactus-custom/${sise['Pc1']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
+                            data-pc5="${sise['Pc5']}"
+                            onclick="window.location.href = '/contactus-custom/${sise['Pc5']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
                     </button>
                     </button>
                 </td>
                 </td>
             `);
             `);
@@ -369,6 +387,20 @@ function contactForMembership(){
     window.location.href = url;
     window.location.href = url;
 }
 }
 
 
+function searchDate(date, currentSiseType){
+    if(currentSiseType){
+        return mainSiseList.filter(function(siseFormDate) {
+            var dateMatch = date ? (siseFormDate['Pc6'] && siseFormDate['Pc6'] === date) : true;
+            var typeMatch = siseFormDate['Pc5'].toLowerCase().includes(currentSiseType);
+            return dateMatch && typeMatch;
+        });
+    }
+    return mainSiseList.filter(function(siseFormDate) {
+        var dateMatch = date ? (siseFormDate['Pc6'] && siseFormDate['Pc6'] === date) : true;
+        return dateMatch;
+    });
+}
+
 var swiper = new Swiper(".main_visual .swiper", {
 var swiper = new Swiper(".main_visual .swiper", {
 	loop: true,
 	loop: true,
 	autoplay: {
 	autoplay: {
@@ -397,6 +429,15 @@ function truncateText(text, maxLength, suffix = '...') {
     return text.substr(0, maxLength) + suffix;
     return text.substr(0, maxLength) + suffix;
 }
 }
 
 
+function dateFormat(date){
+    var formattedDate = '';
+    if (date) {
+        var parts = date.split('-');
+        formattedDate = parts.join('');
+    }
+    return formattedDate;
+}
+
 const mainSiseList = {!! json_encode($mainSiseList['Page']) !!};
 const mainSiseList = {!! json_encode($mainSiseList['Page']) !!};
 const mainYoutubeList = {!! json_encode($mainYoutubeList['Page']) !!};
 const mainYoutubeList = {!! json_encode($mainYoutubeList['Page']) !!};
 const mainBlogList = {!! json_encode($mainBlogList['Page']) !!};
 const mainBlogList = {!! json_encode($mainBlogList['Page']) !!};

+ 0 - 248
pro/resources/views/layouts/master.blade copy.php

@@ -1,248 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <script src="{{ csset('/js/plugins/vue/vue@2.6.11.js') }}"></script>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-	<meta property="og:image" content="/public/themes/kbgolf/pro/resources/images/og_img.png">
-    <script src="https://t1.kakaocdn.net/kakao_js_sdk/2.1.0/kakao.min.js" integrity="sha384-dpu02ieKC6NUeKFoGMOKz6102CLEWi9+5RQjWSV0ikYSFFd8M3Wp2reIcquJOemx" crossorigin="anonymous"></script>
-    <script src="https://static.nid.naver.com/js/naveridlogin_js_sdk_2.0.0.js"></script>
-
-
-    @stack('meta')
-
-    @php $seoHtml = App\Helpers\Utils::getSeoHtml(); @endphp
-    @empty ($seoHtml)
-        <title>{{ env('APP_NAME') }}</title>
-        <link rel="icon" href="{{ msset(env('FAVICON_PATH')) }}" type="image/x-icon">
-    @else
-        {!! $seoHtml !!}
-    @endempty
-
-    <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,300i,400,400i,500,500i,700,700i&display=swap" rel="stylesheet">
-
-    @php $basePath = '/themes/kbgolf/pro/resources'; @endphp
-
-    @include('views.partial.site.meta', [ 'basePath' => $basePath ])
-    @include('views.partial.site.scripts', [ 'basePath' => $basePath ])
-
-    @stack('css')
-
-</head>
-
-
-<!-- page wrapper -->
-<body class="boxed_wrapper">
-    @inject('callApiService', 'App\Services\CallApiService')
-
-    @php
-        $mainMenuPerm = App\Helpers\Utils::getProMainMenu();
-        $mainMenuPermPage = collect($mainMenuPerm['Page'])->filter(function ($menu) {
-            return $menu['Sort'] === 'primary';
-        })->toArray();
-         $topMenuPermPage = collect($mainMenuPerm['Page'])->filter(function ($menu) {
-            return $menu['Sort'] === 'top';
-        })->toArray();
-        $mainMenuList = App\Helpers\Utils::formatMenuList($mainMenuPermPage, 'MenuCode');
-        $topMenuList = App\Helpers\Utils::formatMenuList($topMenuPermPage, 'MenuCode');
-    @endphp
-
-    @include('layouts.js-lang')
-    @include('vendor.lara-izitoast.toast')
-    <div id="quick-launcher"></div>
-	<div id="quick-launcher">
-		<div class="dabory-quick-B quick-launcher quick_kbgolf">
-            <ul>
-                <li>
-                    <button type="button" class="return-to-bottom">
-                        <span class="ico ico-bottom"></span>
-                    </button>
-                </li>
-                <li>
-					<dl class="quick_tel">
-						<dt>	회원권 문의</dt>
-						<dd>
-							본사
-							<strong>02-572-1888</strong>
-						</dd>
-						<dd>
-							충청지사
-							<strong>044-863-1889</strong>
-						</dd>
-					</dl>
-				</li>
-
-                @foreach ($oauth2InfoList as $provider => $oauth2)
-                    @if($provider !='dabory')
-						<!-- <button type="button" class="btn_{{$provider}}" onclick="window.location.href = '{{ route('social.redirectToProvider', [ 'oauth2Info' => $oauth2, 'provider' => $provider, 'target' => 'member' ]) }}'"> {{ $provider == 'kakao' ? '카카오' : '네이버' }} 1초 회원가입/로그인</button> -->
-                        <li>
-                            <button type="button" class="show-widget-btn" data-widget="{{ $provider }}" onclick="window.location.href = '{{ route('social.redirectToProvider', [ 'oauth2Info' => $oauth2, 'provider' => $provider, 'target' => 'member' ]) }}'">
-                                <img src="{{ asset('themes/kbgolf/pro/resources/images/icn_' . $provider . 'talk.png') }}" alt="{{ $provider }}">
-                                @if($provider == 'naver')
-                                    <p class="txt">{{ $provider }} 톡톡</p>
-                                @else
-                                <p class="txt">{{ $provider }} 플러스 친구</p>
-                                @endif
-                            </button>
-                        </li>
-                    @endif
-				@endforeach
-				<!-- <li>
-
-					<button type="button" class="show-widget-btn" data-widget="coupon">
-						<img src="/themes/kbgolf/pro/resources/images/icn_navertalk.png" alt="네네이버 톡톡">
-						<p class="txt">네이버 톡톡</p>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="show-widget-btn" id="kakao-plus-friend-btn" data-widget="contact-us">
-						<img src="/themes/kbgolf/pro/resources/images/icn_kakaotalk.png" alt="카톡 플러스 친구">
-						<p class="txt">카톡 플러스 친구</p>
-					</button>
-				</li> -->
-                <li>
-                    <button type="button" class="return-to-top">
-                        <span class="ico ico-top"></span>
-                    </button>
-                </li>
-            </ul>
-        </div>
-	</div>
-
-    <!-- main header -->
-    @include('views.layouts.main-header')
-    <!-- main-header end -->
-
-    <!-- Mobile Menu  -->
-    @include('views.layouts.mobile-menu')
-    <!-- End Mobile Menu -->
-
-    <div id="app">
-        @yield('content')
-    </div>
-
-    <!-- main-footer -->
-    @include('views.layouts.footer')
-    <!-- main-footer end -->
-
-
-    <!-- sidebar cart item -->
-    @include('views.layouts.sidebar')
-    <!-- END sidebar widget item -->
-
-    <!--Scroll to top-->
-    <button class="scroll-top scroll-to-target" data-target="html">
-        <span class="fa fa-arrow-up"></span>
-    </button>
-
-    <div id="element_in_which_to_insert">
-        @yield('modal')
-        @stack('modal')
-    </div>
-
-    <!-- 카카오 모달 -->
-    <!-- <div id="kakaoModal" class="modal">
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <iframe id="kakaoIframe" src="" frameborder="0" style="width: 100%; height: 100%;"></iframe>
-        </div>
-    </div> -->
-
-    @yield('js')
-    @stack('js')
-
-    <script src="{{ csset($basePath . '/js/script.js') }}"></script>
-
-</body><!-- End of .page_wrapper -->
-
-<script>
-    window.apiKey = {
-        KAKAO_REST_API_KEY: "{{ env('KAKAO_REST_API_KEY') }}"
-    };
-    window.naver.client = {
-        NAVER_CLIENT_ID: "{{ env('NAVER_CLIENT_ID') }}"
-    };
-    window.naver.secret = {
-        NAVER_CLIENT_SECRET: "{{ env('NAVER_CLIENT_SECRET') }}"
-    };
-    window.env = (@json($_ENV));
-    window.Member = @json(session('member'));
-    window.CodeTitle = @json($codeTitle ?? '');
-</script>
-
-{{--<script src="{{ asset('/dabory/js/widget.js?serverUrl=https://safebanner.daboryhost.com&api23Key=XJAL+1IF4/EgIVcuTvcAOoH9ASKjnQje71boZaGpzwVyVcCoVRsxzyMee5goucaC6cWxzLdEcYfIkfj6bLukvs9+lOeUa3CLqpCbhd7v99Bxm011kxUllDLY8/NrXFVn8aa1e57jygREHo7xF2LWOJ9LHc2idRmQ9rXbI46sgiZBwPmi6E/mACBIjUcKq+uviA==') }}"></script>--}}
-
-<script>
-    Kakao.init(window.apiKey.KAKAO_REST_API_KEY);
-    $(document).ready(function () {
-        // $.fn.widget.loadModule(function () {
-        //     $('#quick-launcher').quick()
-        // })
-
-        $('.show-widget-btn').on('click', function() {
-            var widgetType = $(this).data('widget');
-            if (widgetType === 'coupon') {  //네이버
-                // var naverLogin = new naver.LoginWithNaverId(
-                // {
-                //     clientId: window.naver.client.NAVER_CLIENT_ID,
-                //     isPopup: true,
-                //     loginButton: { color: "green", type: 3, height: 60 }
-                // });
-
-                // naverLogin.getLoginStatus(function(status) {
-                //     if (status) {
-                //         var user = naverLogin.user;
-                //         openNaverTalk();
-                //     } else {
-                //         callbackUrl ='http://localhost:8002/naver/callback';
-                //         openNaverLogin( window.naver.client.NAVER_CLIENT_ID, callbackUrl );
-                //     }
-                // });
-            }else{  // 카카오
-
-                // var kakaoAuthUrl = `/social/kakao/callback`;
-                // window.location.href = kakaoAuthUrl;
-                // var channelId = '_aAAGj';
-                // var appKey = window.apiKey.KAKAO_REST_API_KEY;
-                // var origin = encodeURIComponent(window.location.origin);
-                // var referer = encodeURIComponent(window.location.href);
-                // var kakaoAgent = encodeURIComponent('sdk/2.1.0 os/javascript sdk_type/javascript lang/ko-KR device/Win32 origin/' + origin);
-                // var redirectUri = `https://pf.kakao.com/${channelId}/chat?api_ver=1.1&kakao_agent=${kakaoAgent}&app_key=${appKey}&referer=${referer}`;
-
-
-                // var redirectUri = encodeURIComponent(window.location.origin + '/kakao/callback');
-                // var kakaoAuthUrl = `https://kauth.kakao.com/oauth/authorize?response_type=code&client_id=${window.apiKey.KAKAO_REST_API_KEY}&redirect_uri=${redirectUri}`;
-                // window.location.href = kakaoAuthUrl;
-                // kakaoIframe.src = redirectUri;
-                // kakaoModal.style.display = "block";
-                // if (Kakao.Auth.getAccessToken()) {
-                //     window.open(redirectUri, '_blank');
-                // } else {
-                //     Kakao.Auth.authorize({
-                //         redirectUri: redirectUri
-                //     });
-                // }
-            }
-
-            // closeModal.onclick = function() {
-            //     kakaoModal.style.display = "none";
-            //     kakaoIframe.src = ""; // 모달 창 닫을 때 iframe src 초기화
-            // }
-
-            // window.onclick = function(event) {
-            //     if (event.target == kakaoModal) {
-            //         kakaoModal.style.display = "none";
-            //         kakaoIframe.src = ""; // 모달 창 닫을 때 iframe src 초기화
-            //     }
-            // }
-    });
-
-
-    });
-
-</script>
-
-</html>

+ 2 - 1
pro/resources/views/page/contactus-custom.blade.php

@@ -74,6 +74,7 @@
 			</div>
 			</div>
 			<div class="term_wrap">
 			<div class="term_wrap">
 				<pre>
 				<pre>
+                {!! $policy['PostContents'] ?? '' !!}
 개인정보의 보유 및 이용 기간
 개인정보의 보유 및 이용 기간
 
 
 이용자의 개인정보는 원칙적으로 개인정보의 수집 및 이용목적이 달성되면 즉시 파기합니다.단,다음의 정보에 대해서는 아래의 이유로 명시한 기간까지 보존합니다.
 이용자의 개인정보는 원칙적으로 개인정보의 수집 및 이용목적이 달성되면 즉시 파기합니다.단,다음의 정보에 대해서는 아래의 이유로 명시한 기간까지 보존합니다.
@@ -167,7 +168,7 @@ chd1706@naver.com
 	<div class="container">
 	<div class="container">
 		<div class="guide">※ 모든 항목을 올바르게 입력하셔야 문의하기 버튼이 활성화 됩니다.</div>
 		<div class="guide">※ 모든 항목을 올바르게 입력하셔야 문의하기 버튼이 활성화 됩니다.</div>
 	    <div class="captcha_wrap d-flex flex-column">
 	    <div class="captcha_wrap d-flex flex-column">
-                    <div id="captcha" class="g-recaptcha mb-3 mb-md-0" data-sitekey="6LeOP1wkAAAAAKp2uLahTyy3ID6Sp4F3CgcOI0u0"></div>
+                    <div id="captcha" class="g-recaptcha mb-3 mb-md-0" data-sitekey="6LdEDgcqAAAAAFB0ti6Jwq1jH8nltyjBIcnqHJ5M"></div>
 			<div class="captch_box">
 			<div class="captch_box">
 			    <div class="d-flex modal-body px-0 m-auto py-5">
 			    <div class="d-flex modal-body px-0 m-auto py-5">
 			        <div class="form-group mb-1">
 			        <div class="form-group mb-1">

+ 33 - 9
pro/resources/views/page/sise.blade.php

@@ -4,6 +4,7 @@
 @php
 @php
     //var_dump($siseList['Page']);
     //var_dump($siseList['Page']);
     //var_dump($siseItems)
     //var_dump($siseItems)
+    $today = date('Y-m-d');
 @endphp
 @endphp
 
 
 <div class="sub golf">
 <div class="sub golf">
@@ -21,6 +22,7 @@
 		<div class="container">
 		<div class="container">
 			<label>회원권 검색</label>
 			<label>회원권 검색</label>
 			<input type="text" id="membership-name" placeholder="회원권명">
 			<input type="text" id="membership-name" placeholder="회원권명">
+            <input type="date" id="date" value="{{$today}}">
 			<button type="button" class="btn" onclick="searchMemberShip()">검색</button>
 			<button type="button" class="btn" onclick="searchMemberShip()">검색</button>
 		</div>
 		</div>
 	</div>
 	</div>
@@ -73,7 +75,7 @@
                                         </td>
                                         </td>
                                         <td data-label="상담신청">
                                         <td data-label="상담신청">
                                             <button type="button" class="btn consult-btn"
                                             <button type="button" class="btn consult-btn"
-                                                    onclick="window.location.href = '{{ route('contactus-custom', [$sise['Pc1'], $sise['PostTitle']]) }}'">상담신청
+                                                    onclick="window.location.href = '{{ route('contactus-custom', [$sise['Pc5'], $sise['PostTitle']]) }}'">상담신청
                                             </button>
                                             </button>
                                         </td>
                                         </td>
                                     </tr>
                                     </tr>
@@ -116,15 +118,37 @@
     // 회원권 검색
     // 회원권 검색
     function searchMemberShip() {
     function searchMemberShip() {
         var membershipName = document.getElementById('membership-name').value.toLowerCase();
         var membershipName = document.getElementById('membership-name').value.toLowerCase();
-        if (!membershipName) {
-            alert('회원권명을 입력해주세요.');
-            return;
+        var date = document.getElementById('date').value;
+        // console.log('date : ', date);
+        // if (!membershipName) {
+        //     alert('회원권명을 입력해주세요.');
+        //     return;
+        // }
+
+        var formattedDate = '';
+        if (date) {
+            var parts = date.split('-');
+            formattedDate = parts.join('');
         }
         }
-        // console.log('siseList : ', siseList);
+
+        console.log('siseList : ', siseList);
+        if(siseList == null){
+            alert('회원권이 존재하지 않습니다');
+        }
+
         var filteredSiseList = siseList.filter(function(sise) {
         var filteredSiseList = siseList.filter(function(sise) {
-            return sise['PostTitle'].toLowerCase().includes(membershipName);
+            var postTitleMatch = sise['PostTitle'].toLowerCase().includes(membershipName);
+            // var dateMatch = sise['Pc6'] && sise['Pc6'] === formattedDate;
+            var dateMatch = date ? (sise['Pc6'] && sise['Pc6'] === formattedDate) : true;
+            console.log('dateMatch : ', dateMatch);
+
+            if(membershipName == ''){
+                return dateMatch
+            }else{
+                return postTitleMatch && dateMatch;
+            }
         });
         });
-
+        // console.log('filteredSiseList : ', filteredSiseList);
         renderSiseList(filteredSiseList);
         renderSiseList(filteredSiseList);
     }
     }
     // 동적으로 tbody 생ㄱ성
     // 동적으로 tbody 생ㄱ성
@@ -166,8 +190,8 @@
             <td data-label="상담신청">
             <td data-label="상담신청">
                 <button type="button" class="btn consult-btn"
                 <button type="button" class="btn consult-btn"
                         data-post-title="${sise['PostTitle']}"
                         data-post-title="${sise['PostTitle']}"
-                        data-pc1="${sise['Pc1']}"
-                        onclick="window.location.href = '/contactus-custom/${sise['Pc1']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
+                        data-pc5="${sise['Pc5']}"
+                        onclick="window.location.href = '/contactus-custom/${sise['Pc5']}/${encodeURIComponent(sise['PostTitle'])}'">상담신청
                 </button>
                 </button>
             </td>
             </td>
         `);
         `);

+ 2 - 2
qry/erp/list/list-type1-insert/post/sise/insert2.sql

@@ -1,12 +1,12 @@
 INSERT INTO pro_post ( created_on, updated_on,
 INSERT INTO pro_post ( created_on, updated_on,
                       post_title, pc1, pc2, pc3,
                       post_title, pc1, pc2, pc3,
                       pc4, pc5, pc6, post_type_id, post_slug,
                       pc4, pc5, pc6, post_type_id, post_slug,
-                        post_no
+                       post_no
 )
 )
 
 
 SELECT UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),
 SELECT UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),
        c1, c2, c3, c4, c5,
        c1, c2, c3, c4, c5,
-       c6, CURDATE(), c8, c9,
+       c6, DATE_FORMAT(DATE_ADD('1899-12-30', INTERVAL c7 DAY), '%Y%m%d') as c7, c8, c9,
        c10
        c10
 FROM dbt_list_type1
 FROM dbt_list_type1
 where list_token = ?
 where list_token = ?

+ 1 - 1
qry/erp/list/list-type1/download/post/post-sise/subqry/insert1.sql

@@ -5,7 +5,7 @@ INSERT INTO dbt_list_type1 	( created_on, list_token, id,
 
 
 SELECT UNIX_TIMESTAMP(), ?, id,
 SELECT UNIX_TIMESTAMP(), ?, id,
        post_title, pc1, pc2, pc3, pc4,
        post_title, pc1, pc2, pc3, pc4,
-       pc5, CURDATE(), post_type_id, post_slug, post_no
+       pc5, STR_TO_DATE(pc6, '%Y%m%d') AS pc6, post_type_id, post_slug, post_no
 
 
 FROM pro_post as mx
 FROM pro_post as mx
 
 

+ 0 - 16
qry/erp/list/list-type1/download/post/sise--/plain.sql

@@ -1,16 +0,0 @@
-select
-    mx.id as id,
-    post_title as c1,           -- 회원권명
-    mx.pc1 as c2,               -- 회원권코드
-    mx.pc2 as c3,               -- 지역코드
-    mx.pc3 as c4,               -- 금일시세
-    mx.pc4 as c5,               -- 전일시세
-    mx.pc5 as c6,               -- 시세타입
-    CURDATE() as c7,            -- 시세일자
-    mx.post_type_id as c8       -- 게시판구분
-from
-    pro_post as mx
-    inner join pro_post_type as pt on pt.id = mx.post_type_id
--- @where
-and pt.post_code = 'sise'
--- @order

+ 0 - 8
qry/erp/list/list-type1/download/post/sise--/plain_cnt.sql

@@ -1,8 +0,0 @@
-SELECT
-	count(*)
-from
-	pro_post as mx
-	inner join pro_post_type as pt on pt.id = mx.post_type_id
--- @where
-and pt.post_code = 'sise'
--- @order

+ 0 - 13
qry/erp/list/list-type1/post/post-sise-input--/subqry/insert1.sql

@@ -1,13 +0,0 @@
-INSERT INTO dbt_list_type1 	( created_on, list_token, id,
-	c1, c2, c3, c4, c5, c6, c7
-    )
-
-select
-    UNIX_TIMESTAMP(), ?, mx.id,
-    post_title, mx.pc5, mx.pc2, mx.pc3, mx.pc4,
-    mx.pc1, DATE_FORMAT(CURDATE(), '%Y-%m-%d')
-from
-    pro_post as mx
-    inner join pro_post_type as pt on pt.id = mx.post_type_id
--- @where
--- @order

+ 0 - 17
qry/erp/list/list-type1/post/post-sise-input--22/plain.sql

@@ -1,17 +0,0 @@
-select
-    mx.id as id,
-    post_title as c1,           -- 회원권명
-    mx.pc1 as c2,               -- 회원권코드
-    mx.pc2 as c3,               -- 지역코드
-    mx.pc3 as c4,               -- 금일시세
-    mx.pc4 as c5,                -- 전일시세
-    mx.pc5 as c6,                -- 시세타입
-    CURDATE() as c7,            -- 시세일자
-    mx.post_type_id as c8,             -- 게시판구분
-    mx.post_slug as c9,             -- 게시판슬러그
-    mx.post_no as c10            -- 게시판번호
-from
-    pro_post as mx
-        inner join pro_post_type as pt on pt.id = mx.post_type_id
--- @where
-        and pt.post_code = 'sise'

+ 0 - 8
qry/erp/list/list-type1/post/post-sise-input--22/plain_cnt.sql

@@ -1,8 +0,0 @@
-SELECT
-	count(*)
-from
-	pro_post as mx
-	inner join pro_post_type as pt on pt.id = mx.post_type_id
--- @where
-and pt.post_code = 'sise'
--- @order

Some files were not shown because too many files changed in this diff