30 Commitit 0cc991834f ... 28f3d17b64

Tekijä SHA1 Viesti Päivämäärä
  wngur6076 28f3d17b64 t 1 kuukausi sitten
  wngur6076 bdb7ef181f Merge remote-tracking branch 'refs/remotes/origin/master' 1 kuukausi sitten
  wngur6076 66307bee54 t 1 kuukausi sitten
  hokky 0c8a6de4da 241011-1108-Kim 1 kuukausi sitten
  hokky 3b63502ab2 241011-1012-Kim 1 kuukausi sitten
  hokky 8d2fe6781a 241011-0958-Kim 1 kuukausi sitten
  hokky 5adfeb3741 241011-0950-Kim 1 kuukausi sitten
  wngur6076 f479f335cc t 1 kuukausi sitten
  wngur6076 e03e481f1a t 1 kuukausi sitten
  hokky 8dc14c33af 241010-2036-Kim 1 kuukausi sitten
  hokky b3712015ab 241010-1918-Kim 1 kuukausi sitten
  hokky cdeeccc2aa 241010-1908-Kim 1 kuukausi sitten
  hokky f03647fa3c Merge branch 'master' of http://git.daboryhost.com:10880/dabory/dbrerp 1 kuukausi sitten
  EricKIm 685cc00a35 Merge branch 'master' of http://git.daboryhost.com:10880/dabory/dbrerp 1 kuukausi sitten
  kimhi65 2fcd291fb2 241010-1828-Kim 1 kuukausi sitten
  kimhi65 0026e3933d 241010-1602-Kim 1 kuukausi sitten
  wngur6076 ac13d2d64b Merge remote-tracking branch 'refs/remotes/origin/master' 1 kuukausi sitten
  wngur6076 f716fa9dea t 1 kuukausi sitten
  hokky 7cb1c554c5 241010-1515-Kim 1 kuukausi sitten
  hokky 4d3f765431 Merge branch 'master' of http://git.daboryhost.com:10880/dabory/dbrerp 1 kuukausi sitten
  kimhi65 3d0c97e324 Merge branch 'master' of http://git.daboryhost.com:10880/dabory/dbrerp 1 kuukausi sitten
  kimhi65 2cb6490e10 241008-1740-Kim 1 kuukausi sitten
  kimhi65 69ad0825d7 241008-1739-Kim 1 kuukausi sitten
  wngur6076 6f7873090c Merge remote-tracking branch 'refs/remotes/origin/master' 1 kuukausi sitten
  wngur6076 504720f829 t 1 kuukausi sitten
  hokky 3f5d50de0f 241008-1601-Kim 1 kuukausi sitten
  hokky 8bdc2d4cc4 241007-1655-Kim 1 kuukausi sitten
  hokky a35b47c9f6 241007-1606-Kim 1 kuukausi sitten
  kimhi65 3c1ab261e6 241007-1501-Kim 1 kuukausi sitten
  hokky 1c37557b75 241007-1137-Kim 1 kuukausi sitten
37 muutettua tiedostoa jossa 25822 lisäystä ja 1319 poistoa
  1. 18 0
      app/Helpers/DataConverter.php
  2. 36 0
      app/Http/Controllers/Front/Dabory/Erp/BasicSettings/MonthlySettleController.php
  3. 1 1
      app/Http/Controllers/Front/Dabory/Erp/Revenue/SalesController.php
  4. 1 1
      app/Http/Controllers/Front/Dabory/Erp/Revenue/SorderController.php
  5. 0 1
      config/view.php
  6. 1 1
      dabory/para/erp/ko_KR/etc/code-title/ship-type/item.json
  7. 61 0
      dabory/para/erp/ko_KR/form/form-a/monthly-settle.json
  8. 3 5
      dabory/para/erp/ko_KR/form/form-b/point/credit.json
  9. 3 5
      dabory/para/erp/ko_KR/form/form-b/point/reward.json
  10. 314 0
      dabory/para/erp/ko_KR/list/list-type1/shop-order/sorder-bd-pro-total-popfil.json
  11. 54 0
      dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-bd-pro-total-popfil.json
  12. 1 1
      dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-pro-total-popfil-exchange.json
  13. 1 1
      dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-pro-total-popfil-return.json
  14. 274 0
      dabory/para/erp/ko_KR/popup/popup-list1/sorder-bd-pro-no-total.json
  15. 24 0
      dabory/para/erp/ko_KR/popup/popup-setup/form-a/header-footer-html.json
  16. 3 3
      dabory/para/erp/ko_KR/search/company-search/company.json
  17. 9 224
      public/css/all.min.css
  18. 24513 0
      public/css/all.min.css--
  19. 0 1029
      public/index.html
  20. 4 4
      public/js/dashboard/bars.js
  21. 1 1
      public/js/dashboard/sparklines.js
  22. 7 7
      public/js/main/sparklines.js
  23. 27 8
      public/js/utils/lib.js
  24. 1 1
      resources/views/dbrbbs/details.blade.php
  25. 1 1
      resources/views/dbrbbs/list.blade.php
  26. 3 3
      resources/views/front/dabory/erp/accounting/acc-slip-form.blade.php
  27. 175 0
      resources/views/front/dabory/erp/basic-settings/monthly-settle.blade.php
  28. 18 4
      resources/views/front/dabory/erp/coupon-credit/credit.blade.php
  29. 31 9
      resources/views/front/dabory/erp/coupon-credit/reward.blade.php
  30. 1 1
      resources/views/front/dabory/erp/list-type/list1-form.blade.php
  31. 2 2
      resources/views/front/dabory/erp/list-type/setup-type1.blade.php
  32. 134 0
      resources/views/front/dabory/erp/popup-setup/form-a/header-footer-html-form.blade.php
  33. 1 4
      resources/views/front/dabory/erp/popup-setup/form-a/seo-html-form.blade.php
  34. 96 0
      resources/views/front/dabory/erp/popup/popup-list1/form-tab/sorder-bd-pro-no-total.blade.php
  35. 1 1
      resources/views/pages/generic_dash.blade.php
  36. 1 0
      routes/dabory.php
  37. 1 1
      routes/web.php

+ 18 - 0
app/Helpers/DataConverter.php

@@ -189,6 +189,11 @@ class DataConverter
         return self::$codeTitle['ship-type'][$value][$data]['Title'] ?? 'Invalid';
     }
 
+    public static function format_func_body_situation($value, $data)
+    {
+        return self::$codeTitle['body-situation'][$value][$data]['Title'] ?? 'Invalid';
+    }
+
     public static function get_status($value)
     {
         if (isset(self::$codeTitle['status'][$value])) {
@@ -396,4 +401,17 @@ class DataConverter
             self::$codeTitle['condition-type'][$value] = null;
         }
     }
+
+    public static function get_body_situation($value)
+    {
+        if (isset(self::$codeTitle['body-situation'][$value])) {
+            return;
+        }
+
+        try {
+            self::$codeTitle['body-situation'][$value] = collect(Utils::getParamFile("/etc/code-title/body-situation/{$value}"))->keyBy('Code')->toArray();
+        } catch (ParameterException $e) {
+            self::$codeTitle['body-situation'][$value] = null;
+        }
+    }
 }

+ 36 - 0
app/Http/Controllers/Front/Dabory/Erp/BasicSettings/MonthlySettleController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers\Front\Dabory\Erp\BasicSettings;
+
+use App\Helpers\Utils;
+use App\Models\Parameter\FormA;
+use App\Models\Parameter\Modal;
+use App\Http\Controllers\Controller;
+use App\Exceptions\ParameterException;
+
+class MonthlySettleController extends Controller
+{
+    public function index()
+    {
+        try {
+            $monthArr = [
+                "1월", "2월", "3월", "4월", "5월", "6월",
+                "7월", "8월", "9월", "10월", "11월", "12월"
+            ];
+            $formA = new FormA(request('bpa'));
+        } catch (ParameterException $e) {
+            return redirect()->route('dashboard')->with('error', $e->getMessage());
+        }
+
+//         dump($formA->getData());
+
+        $menuCode = Utils::bpaDecoding(request('bpa'))['menu_code'];
+
+        return view('front.dabory.erp.basic-settings.monthly-settle',
+            array_merge(
+                compact('menuCode'),
+                $formA->getData(),
+                compact('monthArr'))
+            );
+    }
+}

+ 1 - 1
app/Http/Controllers/Front/Dabory/Erp/Revenue/SalesController.php

@@ -17,7 +17,7 @@ class SalesController extends Controller
             // dd($formB);
             $salesModal = (new Modal('/search/slip-search/sales/sales'))->getData();
             $sorderModal = (new Modal('/search/slip-search/sales/sorder'))->getData();
-            $companyModal = (new Modal('/search/company-search/supplier'))->getData();
+            $companyModal = (new Modal('/search/company-search/company'))->getData();
             $itemModal = (new Modal('/search/item-search/supplier'))->getData();
         } catch (ParameterException $e) {
             return redirect()->route('dashboard')->with('error', $e->getMessage());

+ 1 - 1
app/Http/Controllers/Front/Dabory/Erp/Revenue/SorderController.php

@@ -16,7 +16,7 @@ class SorderController extends Controller
         try {
             $formB = new FormB(request('bpa'));
             $sorderModal = (new Modal('/search/slip-search/sales/sorder'))->getData();
-            $companyModal = (new Modal('/search/company-search/all'))->getData();
+            $companyModal = (new Modal('/search/company-search/company'))->getData();
             $itemModal = (new Modal('/search/item-search/sales'))->getData();
         } catch (ParameterException $e) {
             return redirect()->route('dashboard')->with('error', $e->getMessage());

+ 0 - 1
config/view.php

@@ -16,7 +16,6 @@ return [
     'paths' => [
         resource_path('views'),
         daboryPath('themes/' . env('DBR_THEME') . '/pro/resources'),
-        daboryPath('themes/' . env('DBR_THEME') . '/erp/resources'),
         daboryPath('themes/' . env('DBR_THEME')),
         daboryPath('themes'),
 //        public_path('themes'),

+ 1 - 1
dabory/para/erp/ko_KR/etc/code-title/ship-type/item.json

@@ -25,6 +25,6 @@
     },
     {
         "Code": "freezer-arrive",
-        "Title": "냉배송"
+        "Title": "냉배송"
     }
 ]

+ 61 - 0
dabory/para/erp/ko_KR/form/form-a/monthly-settle.json

@@ -0,0 +1,61 @@
+{
+    "General": {
+        "Title": "월별 재정산(마감)",
+        "ActApi": "monthly-settle"
+    },
+
+    "SelectButtonOptions": [
+        {
+            "Value": "new",
+            "Caption": "추가"
+        },
+        {
+            "Value": "del",
+            "Caption": "삭제"
+        },
+        {
+            "Value": "copy",
+            "Caption": "복사"
+        }
+    ],
+
+    "//FormVars": "ListVars[0]-Title, ListVars[1]-Format, ListVars[2]-MaxLength, ListVars[3]-Required",
+    "FormVars": [
+        {
+            "ReCalulationButton": "재정산 실행",
+            "IsBalBuyer": "매출 원장 재정산",
+            "IsBalSupplier": "매입 원장 재정산",
+            "IsBalItem": "수불 원장 재정산",
+            "IsBalReward": "적립금 원장 재정산",
+            "IsBalCredit": "충전금 원장 재정산",
+            "YyyyMm": "정산년월"
+        },
+        {
+            "ReCalulationButton": "",
+            "IsBalBuyer": "",
+            "IsBalSupplier": "",
+            "IsBalItem": "",
+            "IsBalReward": "",
+            "IsBalCredit": "",
+            "YyyyMm": ""
+        },
+        {
+            "ReCalulationButton": "0",
+            "IsBalBuyer": "0",
+            "IsBalSupplier": "0",
+            "IsBalItem": "0",
+            "IsBalReward": "0",
+            "IsBalCredit": "0",
+            "YyyyMm": ""
+        },
+        {
+            "ReCalulationButton": "",
+            "IsBalBuyer": "",
+            "IsBalSupplier": "",
+            "IsBalItem": "",
+            "IsBalReward": "",
+            "IsBalCredit": "",
+            "YyyyMm": "required"
+        }
+    ]
+}

+ 3 - 5
dabory/para/erp/ko_KR/form/form-b/point/credit.json

@@ -15,11 +15,6 @@
             "Caption": "추가",
             "Parameter": ""
         },
-        {
-            "Value": "save-and-new",
-            "Caption": "저장 후 추가",
-            "Parameter": ""
-        },
         {
             "Value": "delete",
             "Caption": "삭제",
@@ -82,6 +77,7 @@
     "ListVars": [
         {
             "$Radio": "$Radio",
+            "CompanyNo": "고객번호",
             "CompanyName": "고객명#",
             "DealName": "거래구분",
             "CreditAmt": "충전금액#",
@@ -89,6 +85,7 @@
         },
         {
             "$Radio": "3",
+            "CompanyNo": "5",
             "CompanyName": "10",
             "DealName": "10",
             "CreditAmt": "10",
@@ -97,6 +94,7 @@
         {
 
             "$Radio": "center",
+            "CompanyNo": "center",
             "CompanyName": "left#",
             "DealName": "center",
             "CreditAmt": "decimal('sales_amt')",

+ 3 - 5
dabory/para/erp/ko_KR/form/form-b/point/reward.json

@@ -15,11 +15,6 @@
             "Caption": "추가",
             "Parameter": ""
         },
-        {
-            "Value": "save-and-new",
-            "Caption": "저장 후 추가",
-            "Parameter": ""
-        },
         {
             "Value": "delete",
             "Caption": "삭제",
@@ -82,6 +77,7 @@
     "ListVars": [
         {
             "$Radio": "$Radio",
+            "CompanyNo": "고객번호",
             "CompanyName": "고객명#",
             "DealName": "거래구분",
             "RewardAmt": "적립금액#",
@@ -89,6 +85,7 @@
         },
         {
             "$Radio": "3",
+            "CompanyNo": "5",
             "CompanyName": "10",
             "DealName": "10",
             "RewardAmt": "10",
@@ -97,6 +94,7 @@
         {
 
             "$Radio": "center",
+            "CompanyNo": "center",
             "CompanyName": "left#",
             "DealName": "center",
             "RewardAmt": "decimal('sales_amt')",

+ 314 - 0
dabory/para/erp/ko_KR/list/list-type1/shop-order/sorder-bd-pro-total-popfil.json

@@ -0,0 +1,314 @@
+{
+    "//list-type-1": "simple and plain list by query of table join",
+
+    "General": {
+        "Title": "일부품목 교환/반품 리스트(팝업필터)",
+        "PageApi": "list-type1-page",
+        "ActApi": "sorder-act"
+    },
+
+    "QueryVars": {
+        "QueryName": "shop-order/sorder-bd-pro-total-popfil",
+        "FilterName": "",
+        "FilterValue": "",
+        "FilterDate": "sorder_date"
+    },
+
+    "HeadSelectOptions": [
+        {
+            "Value": "dummy",
+            "Caption": "조회 조건 설정",
+            "Component": "popup-form1.form-filter.shop-order.sorder-pro-total-popfil",
+            "Parameter": "/popup/popup-form1/form-filter/shop-order/sorder-bd-pro-total-popfil"
+        },
+        {
+            "Value": "clear-all-filter",
+            "Caption": "입력값 리셋"
+        },
+        {
+            "Value": "pdf-report",
+            "Caption": "PDF 화일 다운로드"
+        },
+        {
+            "Value": "modified-report",
+            "Caption": "변형 서식"
+        }
+    ],
+
+    "//FormVars": "FormVars[0]-caption, FormVars[1]-searchPopup",
+    "FormVars": [
+        {
+            "ListButton": "",
+            "DateRange": "",
+            "DateNavi": "",
+            "Date": "",
+            "From": "",
+            "To": "",
+            "FirstRange": "",
+            "SecondRange": "",
+            "ThirdRange": "",
+            "FourthRange": "",
+            "AddTotalLine": "",
+            "SelectPopup": "",
+            "MultiPopup": "",
+            "ChartPopup": "",
+            "DownloadList": "",
+            "ShowOnlyClosed": "",
+            "Balance": "",
+            "OrderBy": "",
+            "FilterOption": "",
+            "SimpleOption": ""
+        }
+    ],
+
+    "FilterSelectOptions": [
+        {
+            "Value": "",
+            "Caption": "==조회 선택=="
+        },
+        {
+            "Value": "item_name",
+            "Caption": "품명"
+        }
+    ],
+
+    "SimpleSelectOptions": [
+        {
+            "Value": "",
+            "Caption": "status('sorder','')"
+        },
+        {
+            "Value": "mx.status='0'",
+            "Caption": "status('sorder','0')"
+        },
+        {
+            "Value": "mx.status='1'",
+            "Caption": "status('sorder','1')"
+        },
+        {
+            "Value": "mx.status='2'",
+            "Caption": "status('sorder','2')"
+        },
+        {
+            "Value": "mx.status='3'",
+            "Caption": "status('sorder','3')"
+        },
+        {
+            "Value": "mx.status='4'",
+            "Caption": "status('sorder','4')"
+        },
+        {
+            "Value": "mx.status='5'",
+            "Caption": "status('sorder','5')"
+        },
+        {
+            "Value": "mx.status='F' or mx.status='C' or mx.status='R' or mx.status='E' or mx.status='M'",
+            "Caption": "=클레임전체="
+        },
+        {
+            "Value": "mx.status='F'",
+            "Caption": "status('sorder','F')"
+        },
+        {
+            "Value": "mx.status='C'",
+            "Caption": "status('sorder','C')"
+        },
+        {
+            "Value": "mx.status='R'",
+            "Caption": "status('sorder','R')"
+        },
+        {
+            "Value": "mx.status='E'",
+            "Caption": "status('sorder','E')"
+        },
+        {
+            "Value": "mx.status='M'",
+            "Caption": "status('sorder','M')"
+        }
+    ],
+
+    "//ListType1RangeVars": "[0]-filter, [1]-component, [2]-parameter",
+    "ListType1RangeVars": [
+        {
+            "FirstRange": "",
+            "SecondRange": "",
+            "ThirdRange": "",
+            "FourthRange": ""
+        },
+        {
+            "FirstRange": "",
+            "SecondRange": "",
+            "ThirdRange": "",
+            "FourthRange": ""
+        },
+        {
+            "FirstRange": "",
+            "SecondRange": "",
+            "ThirdRange": "",
+            "FourthRange": ""
+        }
+    ],
+
+    "// DateRangeOptions": "월:현재월의 1~30, 분기: 현재분기의 첫째월 1일 ~ 마지막월의 말일, 반기/년 동일한 컨셉,전체:1990~3000",
+    "DateRangeOptions": [
+        {
+            "Value": "day",
+            "Caption": "일"
+        },
+        {
+            "Value": "week",
+            "Caption": "주"
+        },
+        {
+            "Value": "month",
+            "Caption": "월"
+        },
+        {
+            "Value": "quarterly",
+            "Caption": "분기"
+        },
+        {
+            "Value": "semiannual",
+            "Caption": "반기"
+        },
+        {
+            "Value": "year",
+            "Caption": "년"
+        },
+        {
+            "Value": "all",
+            "Caption": "전체"
+        }
+    ],
+
+    "DateNaviOptions": [
+        {
+            "Value": "day",
+            "Caption": "일"
+        },
+        {
+            "Value": "week",
+            "Caption": "주"
+        },
+        {
+            "Value": "month",
+            "Caption": "월"
+        },
+        {
+            "Value": "quarterly",
+            "Caption": "분기"
+        },
+        {
+            "Value": "semiannual",
+            "Caption": "반기"
+        },
+        {
+            "Value": "year",
+            "Caption": "년"
+        },
+        {
+            "Value": "all",
+            "Caption": "전체"
+        }
+    ],
+
+    "SelectPopupOptions": [
+        {
+            "Caption": "일부품목 교환/반품 상세 보기",
+            "Component": "list-type.list1-form",
+            "Parameter": "/popup/popup-list1/sorder-bd-pro-no-total"
+        }
+    ],
+
+    "MultiPopupOptions": [
+
+    ],
+
+    "// OrderByOptions": "OrderBy Options//첫번째 Value가 Default",
+    "OrderByOptions": [
+        {
+            "Value": "mb.id desc",
+            "Caption": "아이디 번호 역순"
+        },
+        {
+            "Value": "mb.id asc",
+            "Caption": "아이디 번호 정렬순"
+        }
+    ],
+
+    "//BalanceOptions": "Show OnlyBalaceRemained or All",
+    "BalanceOptions": [
+        {
+            "Value": "",
+            "Caption": "전체 보기"
+        },
+        {
+            "Value": "c10 > 0",
+            "Caption": "잔량있는 것만"
+        }
+    ],
+
+    "ThumbContainerVars": {
+        "ListWidth": 50,
+        "ListHeight": 50
+    },
+
+    "DisplayVars": {
+        "IsntPagination": true,
+        "IsAddTotalLine": false,
+        "IsExcelColumn": false,
+        "IsSplitColumn" : true,
+        "IsDownloadList": false,
+        "IsShowOnlyClosed": false,
+        "IsListFirst": false,
+        "IsSelectPopupHidden": false,
+        "IsC1Popup": "2",
+        "InitLines": 10,
+        "HeadHeight": "1",
+        "BodyHeight": "580"
+    },
+
+    "// ListVars": "ListVars[0]-caption, ListVars[1]-size(px), ListVars[2]-align->right(number) left(left)",
+    "ListVars": [
+        {
+            "$Radio": "",
+            "$Check": "$Check",
+            "No": "번호",
+            "C1": "주문 번호 | 일자 | 입점사 ",
+            "C2": "대표품목",
+            "C3": "사진",
+            "C4": "주문ID | 주문자 | 수취인",
+            "C5": "주문연락 | 수취연락",
+            "C6": "수량 | 금액",
+            "C7": "배송 | 기한 | 택배",
+            "C8": "상태 | 변경일시 | 클레임"
+
+        },
+        {
+            "$Radio": "10",
+            "$Check": "3",
+            "No": "0",
+            "C1": "10",
+            "C2": "23",
+            "C3": "3",
+            "C4": "8",
+            "C5": "7",
+            "C6": "5",
+            "C7": "8",
+            "C8": "8"
+        },
+        {
+            "$Radio": "center",
+            "$Check": "center",
+            "No": "center",
+            "C1": "center|^unixtime|^center",
+            "C2": "center",
+            "C3": "$_ThumbNail",
+            "C4": "center|^center|^center",
+            "C5": "center|^center",
+            "C6": "decimal('sales_prc')|^decimal('sales_amt')",
+            "C7": "center",
+            "C8": "situation('sorder')|^unixtime|^body_situation('sorder-bd')"
+        }
+    ]
+}

+ 54 - 0
dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-bd-pro-total-popfil.json

@@ -0,0 +1,54 @@
+{
+    "DisplayVars": {
+        "SorderStatus": [
+            "C"
+        ],
+        "SorderSituation": [
+            "RJ", "EJ"
+        ]
+    },
+
+    "//FormVars": "ListVars[0]-Caption",
+    "FormVars": [
+        {
+            "SaveButton": "저장",
+            "Company": "공급/입점사",
+            "OrderSearch": "주문항목",
+            "SorderStatus": "배송유형",
+            "SorderSituation": "배송 클레임 유형",
+            "CargoType": "화물유형",
+            "ShipType": "배송타입",
+            "DelayType": "처리지연"
+        },
+        {
+            "SaveButton": "",
+            "Company": "left",
+            "OrderSearch": "left",
+            "SorderStatus": "left",
+            "SorderSituation": "left",
+            "CargoType": "left",
+            "ShipType": "left",
+            "DelayType": "left"
+        },
+        {
+            "SaveButton": "0",
+            "Company": "6",
+            "OrderSearch": "20",
+            "SorderStatus": "20",
+            "SorderSituation": "20",
+            "CargoType": "20",
+            "ShipType": "20",
+            "DelayType": "20"
+        },
+        {
+            "SaveButton": "",
+            "Company": "",
+            "OrderSearch": "",
+            "SorderStatus": "",
+            "SorderSituation": "",
+            "CargoType": "",
+            "ShipType": "",
+            "DelayType": ""
+        }
+    ]
+}

+ 1 - 1
dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-pro-total-popfil-exchange.json

@@ -4,7 +4,7 @@
             "C"
         ],
         "SorderSituation": [
-            "EM", "EE", "EP", "ES", "EO"
+            "EA", "EJ"
         ]
     },
 

+ 1 - 1
dabory/para/erp/ko_KR/popup/popup-form1/form-filter/shop-order/sorder-pro-total-popfil-return.json

@@ -4,7 +4,7 @@
             "C"
         ],
         "SorderSituation": [
-            "RM", "RE", "RP", "RC", "RO"
+            "RA", "RJ"
         ]
     },
 

+ 274 - 0
dabory/para/erp/ko_KR/popup/popup-list1/sorder-bd-pro-no-total.json

@@ -0,0 +1,274 @@
+{
+    "//list-type-1": "simple and plain list by query of table join",
+
+    "General": {
+        "PageApi": "popup-list1-page"
+    },
+
+    "QueryVars": {
+        "QueryName": "sorder-bd-pro-no-total",
+        "FilterName": "",
+        "FilterValue": ""
+    },
+
+    "PopupList1Vars": {
+        "PopupFilterName": "mx.id",
+        "PopupWidth": "1200"
+    },
+
+    "HeadSelectOptions": [
+
+    ],
+
+    "TabOptions": [
+        {
+            "Value": "situation",
+            "Caption": "일부품목 교환/반품 처리"
+        }
+    ],
+
+
+    "//FormVars": "FormVars[0]-caption, FormVars[1]-format",
+    "FormVars": [
+        {
+            "ListButton": "저장",
+            "DateRange": "일자범위",
+            "DateNavi": "",
+            "Date": "",
+            "From": "부터",
+            "To": "까지",
+            "DownloadList": "",
+            "ShowOnlyClosed": "",
+            "Balance": "",
+            "OrderBy": "",
+
+            "HeadFirst": "주문번호",
+            "HeadSecond": "고객명",
+            "HeadThird": "상황",
+            "HeadFourth": "클레임상세",
+
+            "ColumnFirst": "이메일",
+            "ColumnSecond": "배송연락처",
+            "ColumnThird": "결제방식",
+            "ColumnFourth": "",
+
+            "TextFirst": "배송주소",
+            "TextSecond": "입금상세",
+            "TextThird": "",
+            "TextFourth": "",
+
+            "FootFirst": "품목소개",
+            "FootSecond": "배송료",
+            "FootThird": "할인 및 차감금액",
+            "FootFourth": "결제금액"
+        },
+        {
+            "ListButton": "left",
+            "DateRange": "left",
+            "Date": "left",
+            "From": "left",
+            "To": "left",
+            "DownloadList": "left",
+            "ShowOnlyClosed": "left",
+            "Balance": "right",
+            "OrderBy": "left",
+
+            "HeadFirst": "center",
+            "HeadSecond": "center",
+            "HeadThird": "status('sorder')",
+            "HeadFourth": "situation('sorder')",
+
+            "ColumnFirst": "left",
+            "ColumnSecond": "left",
+            "ColumnThird": "paymethod('sorder')",
+            "ColumnFourth": "center",
+
+            "TextFirst": "left",
+            "TextSecond": "left",
+            "TextThird": "left",
+            "TextFourth": "left",
+
+            "FootFirst": "decimal('sales_amt')",
+            "FootSecond": "decimal('sales_amt')",
+            "FootThird": "decimal('sales_amt')",
+            "FootFourth": "decimal('sales_amt')"
+        }
+
+    ],
+
+    "// DateRangeOptions": "월:현재월의 1~30, 분기: 현재분기의 첫째월 1일 ~ 마지막월의 말일, 반기/년 동일한 컨셉,전체:1990~3000",
+    "DateRangeOptions": [
+        {
+            "Value": "day",
+            "Caption": "일"
+        },
+        {
+            "Value": "week",
+            "Caption": "주"
+        },
+        {
+            "Value": "month",
+            "Caption": "월"
+        },
+        {
+            "Value": "quarterly",
+            "Caption": "분기"
+        },
+        {
+            "Value": "semiannual",
+            "Caption": "반기"
+        },
+        {
+            "Value": "year",
+            "Caption": "년"
+        },
+        {
+            "Value": "all",
+            "Caption": "전체"
+        }
+    ],
+
+    "SelectPopupOptions": [
+    ],
+
+    "DisplayVars": {
+        "IsntPagination": false,
+        "IsExcelColumn": false,
+        "IsDownloadList": false,
+        "IsShowOnlyClosed": false,
+        "IsListFirst" : true,
+        "InitLines" : 10,
+        "HeadHeight": "",
+        "BodyHeight": "200"
+    },
+
+    "// OrderByOptions": "OrderBy Options//첫번째 Value가 Default",
+    "OrderByOptions": [
+        {
+            "Value": "mx.id asc",
+            "Caption": "주문 시간 순서"
+        },
+        {
+            "Value": "mx.id desc",
+            "Caption": "주문 시간 역순"
+        }
+    ],
+
+    "//BalanceOptions": "Show OnlyBalaceRemained or All",
+    "BalanceOptions": [
+        {
+            "Value": "",
+            "Caption": "전체 보기"
+        },
+        {
+            "Value": "c10 > 0",
+            "Caption": "잔량있는 것만"
+        }
+    ],
+
+    "// ListVars": "ListVars[0]-caption, ListVars[1]-size(px), ListVars[2]-align->right(number) left(left)",
+    "ListVars": [
+        {
+            "$Radio": "$Radio",
+            "No": "번호",
+            "C1": "품목",
+            "C2": "규격",
+            "C3": "수량",
+            "C4": "단가",
+            "C5": "금액",
+            "C6": "",
+            "C7": "",
+            "C8": "",
+            "C9": "",
+            "C10": "",
+            "C11": "",
+            "C12": "",
+            "C13": "",
+            "C14": "",
+            "C15": "",
+            "C16": "",
+            "C17": "",
+            "C18": "",
+            "C19": "",
+            "C20": "",
+            "C21": "",
+            "C22": "",
+            "C23": "",
+            "C24": "",
+            "C25": "",
+            "C26": "",
+            "C27": "",
+            "C28": "",
+            "C29": "",
+            "C30": ""
+        },
+        {
+            "$Radio": "3",
+            "No": "3",
+            "C1": "25",
+            "C2": "6",
+            "C3": "6",
+            "C4": "6",
+            "C5": "6",
+            "C6": "",
+            "C7": "",
+            "C8": "",
+            "C9": "",
+            "C10": "",
+            "C11": "",
+            "C12": "",
+            "C13": "",
+            "C14": "",
+            "C15": "",
+            "C16": "",
+            "C17": "",
+            "C18": "",
+            "C19": "",
+            "C20": "",
+            "C21": "",
+            "C22": "",
+            "C23": "",
+            "C24": "",
+            "C25": "",
+            "C26": "",
+            "C27": "",
+            "C28": "",
+            "C29": "",
+            "C30": ""
+        },
+        {
+            "$Radio": "center",
+            "No": "center",
+            "C1": "left",
+            "C2": "left",
+            "C3": "decimal('sales_qty')",
+            "C4": "decimal('sales_prc')",
+            "C5": "decimal('sales_prc')",
+            "C6": "",
+            "C7": "",
+            "C8": "",
+            "C9": "",
+            "C10": "",
+            "C11": "",
+            "C12": "",
+            "C13": "",
+            "C14": "",
+            "C15": "",
+            "C16": "",
+            "C17": "",
+            "C18": "",
+            "C19": "",
+            "C20": "",
+            "C21": "",
+            "C22": "",
+            "C23": "",
+            "C24": "",
+            "C25": "",
+            "C26": "",
+            "C27": "",
+            "C28": "",
+            "C29": "",
+            "C30": ""
+        }
+    ]
+}

+ 24 - 0
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"
+        }
+    ]
+}

+ 3 - 3
dabory/para/erp/ko_KR/search/company-search/company.json

@@ -1,13 +1,13 @@
 {
     "General": {
-        "Title": "매 업체 찾기",
+        "Title": "매 업체 찾기",
         "PageApi": "company-search-page"
     },
 
     "QueryVars": {
         "QueryName": "company",
-        "FilterName": "",
-        "FilterValue": ""
+        "FilterName": "company_class",
+        "FilterValue": "AA"
     },
 
     "//FormVars": "ListVars[0]-Caption",

+ 9 - 224
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,8 +2415,6 @@ border-radius:.25rem;
 a.btn.disabled, fieldset:disabled a.btn {
 	pointer-events: none
 }
-.btn-group-sm>.btn, 
-.btn-sm {height:32px; padding: 2px 0.625rem;/*.3125rem .75rem;*/ font-size: 13px; line-height:1; border-radius:5px;}
 .btn-primary {
 	color: #fff;
 	background-color:#5c6bc0;
@@ -2953,16 +2945,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;
@@ -3827,8 +3809,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;
@@ -3851,7 +3831,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%
@@ -29606,11 +29592,6 @@ body {
 .content-inner {
 	scroll-behavior: smooth
 }
-	.content-inner .blanker_item {
-		scroll-behavior: smooth
-	}
-
-
 }
 .layout-static, .layout-static .page-content, .layout-static body {
 	overflow: visible
@@ -31345,7 +31326,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;}
 
@@ -31539,166 +31520,8 @@ a:focus {    outline: 0;}
 
 .post-tabbed .tab-pane {padding:0.625rem 0;}
 
-/*프린트 상품등록*/
-.blanker_item .guide,
-.blanker_item .setsize_wrap,
-.editor_wrap  > div,
-.option_wrap  > div {margin-right:32px;}
-.head_btn_add {color:var(--basic-hover);}
-.backslash {width:287px; background-image: linear-gradient(to left bottom, transparent calc(50% - 1px), #ddd, transparent calc(50% + 1px)); background-size: 120% 120%; background-position: center;}
-.backslash div {display:flex; align-items:center; height:50%;}
-.backslash > div:first-child {justify-content:flex-end;}
-.backslash input {margin-left:6px;}
-.backslash a {margin-top:10px;}
-#topAnchor {height:0.5rem; margin-top:-0.5rem;}
-.blanker_item .contents_wrap {margin-top:0;}
-.blanker_item.content {padding-top:0;}
-.blanker_item .topbtn_wrap {position: sticky; top: 0; left: 0; z-index: 110; background: #f6f6f6;}
-.blanker_item .btn-groups {margin-top:-2rem; padding-top:0.625rem; padding-bottom:0.625rem; }
-.blanker_item .anchor {height:101px; margin-top:-101px;}
-.blanker_item .tabs_wrap {position:sticky; top:56px; left:0; margin:-11px; padding:10px; padding-top:0; border: 1px solid rgba(0, 0, 0, .125); border-bottom:0; border-top-left-radius:.25rem; border-top-right-radius:.25rem; overflow:hidden; z-index: 10; background:#fff;}
-.blanker_item .tab-content>.tab-pane {display:block; opacity:1;}
-.blanker_item .card {padding:12px; margin-top:12px;}
-.blanker_item .ptxt_wrap {position: absolute; padding:6px; margin: 5px; display: none; background-color:#5c6bc0; border-radius:5px; z-index:10;}
-.blanker_item .table-responsive {overflow-x: auto;}
-.blanker_item input,
-.blanker_item tbody input[type="text"] {border-radius: .25rem;}
-.blanker_item tbody input[type="text"] {width:auto!important;}
-.blanker_item input::placeholder {color:#787878;}
-.blanker_item ul,
-.blanker_item li {padding:0; margin:0; list-style:none;}
-.blanker_item .stit {display:flex; align-items:center; gap:10px; margin-bottom:10px;}
-.blanker_item .stit h3 {margin-bottom:0; font-weight:700; color:#191919; font-size:14px; }
-.blanker_item .tab-pane {padding:20px 3px;}
-.blanker_item .stit h3 span {font-weight:400;}
-.blanker_item .guide {display:flex; gap:60px; margin-bottom:12px; padding:12px; background-color: #fff; background-clip: border-box;  border: 1px solid rgba(0, 0, 0, .125);   border-radius: .25rem; word-wrap: break-word;}
-.blanker_item .guide dt,
-.blanker_item .guide li {position:relative; padding-left:10px; font-weight:500; color:var(--black);}
-.blanker_item .guide dt:before,
-.blanker_item .guide li:before {content:""; position:absolute; top:7px; left:0; width:4px; height:4px; background:var(--black); border-radius:50px;}
-.blanker_item .guide dd {margin-bottom:3px;}
-.blanker_item .guide dd strong {font-weight:400; color:var(--danger);}
-.blanker_item .guide .txt_sm {margin-top:10px; color:var(--basic-hover);}
-.blanker_item .guide ul {margin-bottom:1rem;}
-
-#pheader1 > td:last-child > div {position:relative; max-width:1230px; text-align:center;}
-.stock_table2 .p_img_area {text-align: left;width: 78px;display: inline-block}
-.stock_table2 .p_img_icon > img {width: 21px; 	height: 21px; cursor: pointer;vertical-align: middle}
-
-.p_tbl_header {background:#f6f6f6;}
-.p_tbl_header,
-.p_tbl_row1 {border-collapse: collapse; table-layout: fixed; width: max-content; border:1px solid #ddd;}
-.p_tbl_header td {padding:8px 5px; border:1px solid #ddd; vertical-align:top;}
-.p_tbl_header td .position-absolute {top:50%; left:5px; transform:translateY(-50%); display: flex;  align-items: center;}
-.p_tbl_header td .position-absolute i {margin-left:6px;}
-.p_tbl_header td > input:first-of-type {margin-top:4px;}
-
-.p_tbl_header .set_qty,
-.p_img_area a,
-.p_text_area a {position:relative; display:inline-block; color:var(--txt-hover); text-decoration:underline;}
-.p_text_area {position:relative;}
-.p_tbl_header .btn_cls {position:relative;}
-.p_tbl_header .btn_cls a {position:absolute; top:-50px; right:0;}
-.p_tbl_header .row {display:block; margin:4px 0; text-align:left;}
-
-.ctl_amount {display: inline-block; vertical-align: middle; font-size: 14px;}
-.ctl_amount i {display:block; margin-left: 2px;}
-
-#pheader2 > td {width:205px; font-size:12px;	}
-tbody input[type="text"].pn
-tbody input[type="text"].row_nk {width:90px!important;}
-tbody input[type="text"].pc1, 
-tbody input[type="text"].pc2, 
-tbody input[type="text"].pw1, 
-tbody input[type="text"].pw2 {width:44px!important;}
-
-.p_tbl_row1 {border-top: none}
-.p_tbl_row1 .p_img_area {width:auto; margin-left:2px;}
-.p_tbl_row1_td1 {position:relative; padding: 5px;  width:116px}
-.p_tbl_row1_td2 {border-left:1px solid #ddd;}
-.p_tbl_row3, .p_tbl_row4 {border-collapse: collapse; table-layout: fixed; border-top: 1px solid #ddd;}
-.p_tbl_row2_td1 {width: 170px;}
-.p_tbl_row2_td1 > input {width:90px!important;}
-.p_tbl_row2_td2 {width: 205px; border-left: 1px solid #ddd;}
-.p_tbl_val2 {border-bottom:1px solid #ddd;}
-.p_tbl_row1_td2_tbl_last,
-.table-responsive > table:nth-of-type(2) .p_tbl_val2:last-of-type,
-.stock_table2 > table:nth-of-type(2) .p_tbl_val2:last-of-type {border-bottom: none}
-
-.on11_opt_type {margin-top:10px;}
-.p_tbl_row2 td, .p_tbl_row3 td, .p_tbl_row4 td {padding: 5px;}
-.p_tbl_row4 .size_div_btn, .p_tbl_row4 .pp {display: none	}
-.p_tbl_row4 {height: 32px}						
-
-.stock_table2 .pr {display: none}
-.stock_table2 .pfo {display: none}
-.stock_table2 .pfd {display: none}
-.stock_table2 .pf {display: none}
-.stock_table2 .pp {width: 90px;}
-.stock_table2 .p_text_icon {
-	display: inline-block;
-	border: 1px solid #CCC;
-	border-radius: 5px;
-	width: 15px;
-	height: 15px;
-	background-color: #EEE;
-	text-align: center
-}
-
-.stock_table2 .p_text_area {
-	height: 25px;
-}
-.stock_table2 .p3v {
-	display: none
-}
-.stock_table2 .size_div_btn {
-	cursor: pointer
-}						
-
-.row2_td1_spc1 {
-	width: 10px;
-	display: inline-block
-}
-.row2_td1_spc2 {
-	width: 25px;
-	display: inline-block
-}
-
-.blanker_item .setsize_wrap {gap:80px;}
-.blanker_item .setsize_wrap .text-orange-700{margin:12px 0;}
-.blanker_item .setsize_wrap a {line-height:28px;}
-.blanker_item .setsize_wrap > div {position:relative;}
-.blanker_item .setsize_wrap > div:first-child:after {content:"\f0da"; font-family: "Font Awesome 5 Free"; font-weight: 900; position:absolute; top:50%; right:-45px; transform:translateY(-50%); color:#ccc; font-size:24px;}
-.set_size input[type="text"] {width:auto!important;}
-.set_size .stit h4 {display:inline-block; font-weight:700; color:var(--danger); font-size:14px;}
-.set_size .stit span {color:var(--black); font-weight:500;}
-.set_size ul {display:flex; align-items:center; gap:20px; margin-top:12px;}
-.set_size dl {display:flex; align-items:center;  gap:10px; color:#666;}
-.set_size dt {margin-bottom:0;}
-
-.blanker_item .editor_wrap .d-flex {flex-wrap:wrap; gap:8px;}
-.blanker_item .editor_wrap .btn {height:28px;}
-
-.blanker_item .option_wrap .tit {gap:10px; padding:12px; background:#f6f6f6;}
-.blanker_item .option_wrap .card {align-items: flex-start; padding:0; padding-bottom:12px;}
-.blanker_item .hu_cnts .card {margin-bottom:0;}
-.blanker_item .hu_cnts table:first-of-type .card {margin-top:12px;}
-.blanker_item .hu_cnts th {width:165px; padding:12px; padding-top:22px; vertical-align:top;}
-.blanker_item .option_wrap a.btn {line-height:28px;}
-.blanker_item .option_wrap .top_tb {width:100%;}
-.blanker_item .option_wrap .top_tb td {padding:12px; background:#f6f6f6;}
-.blanker_item .option_wrap .top_tb .btn_del {position:absolute; right:10px;}
-.blanker_item .sortable0 table tr td,
-.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;}
-
 @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) {
@@ -31757,22 +31580,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) {
@@ -31802,28 +31609,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) {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 24513 - 0
public/css/all.min.css--


+ 0 - 1029
public/index.html

@@ -1,1029 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<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">
-
-<title>Appway - HTML 5 Template Preview</title>
-
-<!-- Fav Icon -->
-<link rel="icon" href="images/favicon.ico" type="image/x-icon">
-
-<!-- Google Fonts -->
-<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,300i,400,400i,500,500i,700,700i&display=swap" rel="stylesheet">
-
-<!-- Stylesheets -->
-<link href="css/font-awesome-all.css" rel="stylesheet">
-<link href="css/flaticon.css" rel="stylesheet">
-<link href="css/owl.css" rel="stylesheet">
-<link href="css/bootstrap.css" rel="stylesheet">
-<link href="css/jquery.fancybox.min.css" rel="stylesheet">
-<link href="css/animate.css" rel="stylesheet">
-<link href="css/imagebg.css" rel="stylesheet">
-<link href="css/style.css" rel="stylesheet">
-<link href="css/responsive.css" rel="stylesheet">
-
-</head>
-
-
-<!-- page wrapper -->
-<body class="boxed_wrapper">
-
-    <!-- preloader -->
-    <div class="preloader"></div>
-    <!-- preloader -->
-
-    <!-- main header -->
-    <header class="main-header home-1">
-        <div class="outer-container">
-            <div class="container">
-                <div class="main-box clearfix">
-                    <div class="logo-box pull-left">
-                        <figure class="logo"><a href="index.html"><img src="images/logo.png" alt=""></a></figure>
-                    </div>
-                    <div class="menu-area pull-right">
-                        <!--Mobile Navigation Toggler-->
-                        <div class="mobile-nav-toggler">
-                            <i class="icon-bar"></i>
-                            <i class="icon-bar"></i>
-                            <i class="icon-bar"></i>
-                        </div>
-                        <nav class="main-menu navbar-expand-md navbar-light">
-                            <div class="collapse navbar-collapse show clearfix" id="navbarSupportedContent">
-                                <ul class="navigation clearfix">
-                                    <li class="current dropdown"><a href="#">Home</a>
-                                        <ul class="megamenu clearfix">
-                                            <li><a href="index.html">App Landing</a></li>
-                                            <li><a href="e-commerce.html">E-Commerce</a></li>
-                                            <li><a href="seo.html">SEO</a></li>
-                                            <li><a href="account-billing.html">Account & Billing</a></li>
-                                            <li><a href="app-showcase.html">App Showcase</a></li>
-                                            <li><a href="hr-management.html">HR Management</a></li>
-                                            <li><a href="email-marketing.html">Email Marketing</a></li>
-                                            <li><a href="payment-processing.html">Payment Processing</a></li>
-                                            <li><a href="startup.html">Startup</a></li>
-                                            <li><a href="digital-marketing.html">Digital Marketing</a></li>
-                                            <li><a href="cloud-saas.html">Cloud Based Saas</a></li>
-                                            <li><a href="prototype-wireframing.html">Prototype & Wireframing</a></li>
-                                            <li><a href="crm-management.html">CRM Management</a></li>
-                                            <li><a href="project-management.html">Project Management</a></li>
-                                            <li><a href="digital-studio.html">Digital Studio</a></li>
-                                            <li><a href="crypto.html">Crypto</a></li>
-                                            <li><a href="ride-sharing.html">Ride Sharing</a></li>
-                                            <li><a href="web-hosting.html">Web Hosting</a></li>
-                                            <li><a href="home-charity.html">Home Charity</a></li>
-                                        </ul>
-                                    </li>
-                                    <li class="dropdown"><a href="#">Pages</a>
-                                        <ul>
-                                            <li class="dropdown"><a href="#">Team Page</a>
-                                                <ul>
-                                                    <li><a href="team.html">Team 01</a></li>
-                                                    <li><a href="team-2.html">Team 02</a></li>
-                                                    <li><a href="team-3.html">Team 03</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Service Page</a>
-                                                <ul>
-                                                    <li><a href="service.html">Our Services</a></li>
-                                                    <li><a href="service-details.html">Service Details</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Pricing Page</a>
-                                                <ul>
-                                                    <li><a href="pricing.html">Pricing 01</a></li>
-                                                    <li><a href="pricing-2.html">Pricing 02</a></li>
-                                                    <li><a href="pricing-3.html">Pricing 03</a></li>
-                                                    <li><a href="pricing-4.html">Pricing 04</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Testimonial Page</a>
-                                                <ul>
-                                                    <li><a href="testimonial.html">Testimonial 01</a></li>
-                                                    <li><a href="testimonial-2.html">Testimonial 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li><a href="about.html">About Us</a></li>
-                                            <li><a href="faq.html">Faq</a></li>
-                                            <li><a href="error.html">Error Page</a></li>
-                                        </ul>
-                                    </li>
-                                    <li class="dropdown"><a href="#">Portfolio</a>
-                                        <ul>
-                                            <li><a href="portfolio.html">Portfolio 01</a></li>
-                                            <li><a href="portfolio-2.html">Portfolio 02</a></li>
-                                            <li><a href="portfolio-3.html">Portfolio 03</a></li>
-                                            <li><a href="portfolio-details.html">Portfolio Details</a></li>
-                                        </ul>
-                                    </li>
-                                    <li class="dropdown"><a href="#">Element</a>
-                                        <ul>
-                                            <li class="dropdown"><a href="#">Miscellaneous 01</a>
-                                                <ul>
-                                                    <li><a href="optimization-application.html">Optimization Application</a></li>
-                                                    <li><a href="device-friendly.html">Device Friendly</a></li>
-                                                    <li><a href="software-product.html">Software Product</a></li>
-                                                    <li><a href="betterlook-layout.html">Betterlook Layout</a></li>
-                                                    <li><a href="whereyou-layout.html">Whereyou Layout</a></li>
-                                                    <li><a href="popular-causes.html">Popular Causes</a></li>
-                                                    <li><a href="wework-layout.html">We work Layout</a></li>
-                                                    <li><a href="campaing-layout.html">Campaing Layout</a></li>
-                                                    <li><a href="donate-layout.html">Donate Layout</a></li>
-                                                    <li><a href="make-difference.html">Make Difference</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Miscellaneous 02</a>
-                                                <ul>
-                                                    <li><a href="solve-problem.html">Solve Problem</a></li>
-                                                    <li><a href="marketing-benefits.html">Marketing Benefits</a></li>
-                                                    <li><a href="streamline-layout.html">Streamline Layout</a></li>
-                                                    <li><a href="powerful-management.html">Powerful Management</a></li>
-                                                    <li><a href="transactions-work.html">Transactions Work</a></li>
-                                                    <li><a href="increase-website.html">Increase Website</a></li>
-                                                    <li><a href="managed-wordpress.html">Managed Wordpress</a></li>
-                                                    <li><a href="history-layout.html">History Layout</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Feature Layout</a>
-                                                <ul>
-                                                    <li><a href="feature-layout-1.html">Feature Layout 01</a></li>
-                                                    <li><a href="feature-layout-2.html">Feature Layout 02</a></li>
-                                                    <li><a href="feature-layout-3.html">Feature Layout 03</a></li>
-                                                    <li><a href="feature-layout-4.html">Feature Layout 04</a></li>
-                                                    <li><a href="feature-layout-5.html">Feature Layout 05</a></li>
-                                                    <li><a href="feature-layout-6.html">Feature Layout 06</a></li>
-                                                    <li><a href="feature-layout-7.html">Feature Layout 07</a></li>
-                                                    <li><a href="feature-layout-8.html">Feature Layout 08</a></li>
-                                                    <li><a href="feature-layout-9.html">Feature Layout 09</a></li>
-                                                    <li><a href="feature-layout-10.html">Feature Layout 10</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Subscribe Layout</a>
-                                                <ul>
-                                                    <li><a href="subscribe-layout-1.html">Subscribe Layout 01</a></li>
-                                                    <li><a href="subscribe-layout-2.html">Subscribe Layout 02</a></li>
-                                                    <li><a href="subscribe-layout-3.html">Subscribe Layout 03</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Video Layout</a>
-                                                <ul>
-                                                    <li><a href="video-layout-1.html">Video Layout 01</a></li>
-                                                    <li><a href="video-layout-2.html">Video Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Download Layout</a>
-                                                <ul>
-                                                    <li><a href="download-layout-1.html">Download Layout 01</a></li>
-                                                    <li><a href="download-layout-2.html">Download Layout 02</a></li>
-                                                    <li><a href="download-layout-3.html">Download Layout 03</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Rider Layout</a>
-                                                <ul>
-                                                    <li><a href="rider-layout-1.html">Rider Layout 01</a></li>
-                                                    <li><a href="rider-layout-2.html">Rider Layout 02</a></li>
-                                                    <li><a href="rider-layout-3.html">Rider Layout 03</a></li>
-                                                    <li><a href="rider-layout-4.html">Rider Layout 04</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Solution Layout</a>
-                                                <ul>
-                                                    <li><a href="solution-layout-1.html">Solution Layout 01</a></li>
-                                                    <li><a href="solution-layout-2.html">Solution Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">News Layout</a>
-                                                <ul>
-                                                    <li><a href="news-layout-1.html">News Layout 01</a></li>
-                                                    <li><a href="news-layout-2.html">News Layout 02</a></li>
-                                                    <li><a href="news-layout-3.html">News Layout 03</a></li>
-                                                    <li><a href="news-layout-4.html">News Layout 04</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Application Layout</a>
-                                                <ul>
-                                                    <li><a href="application-layout-1.html">Application Layout 01</a></li>
-                                                    <li><a href="application-layout-2.html">Application Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Organization Layout</a>
-                                                <ul>
-                                                    <li><a href="organization-layout-1.html">Organization Layout 01</a></li>
-                                                    <li><a href="organization-layout-2.html">Organization Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Work Layout</a>
-                                                <ul>
-                                                    <li><a href="work-layout-1.html">Work Layout 01</a></li>
-                                                    <li><a href="work-layout-2.html">Work Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Service Layout</a>
-                                                <ul>
-                                                    <li><a href="service-layout-1.html">Service Layout 01</a></li>
-                                                    <li><a href="service-layout-2.html">Service Layout 02</a></li>
-                                                    <li><a href="service-layout-3.html">Service Layout 03</a></li>
-                                                    <li><a href="service-layout-4.html">Service Layout 04</a></li>
-                                                    <li><a href="service-layout-5.html">Service Layout 05</a></li>
-                                                    <li><a href="service-layout-6.html">Service Layout 06</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Recruitment Layout</a>
-                                                <ul>
-                                                    <li><a href="recruitment-layout-1.html">Recruitment Layout 01</a></li>
-                                                    <li><a href="recruitment-layout-2.html">Recruitment Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Reasons Layout</a>
-                                                <ul>
-                                                    <li><a href="reasons-layout-1.html">Reasons Layout 01</a></li>
-                                                    <li><a href="reasons-layout-2.html">Reasons Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Hosting Layout</a>
-                                                <ul>
-                                                    <li><a href="hosting-layout-1.html">Hosting Layout 01</a></li>
-                                                    <li><a href="hosting-layout-2.html">Hosting Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Counter Layout</a>
-                                                <ul>
-                                                    <li><a href="counter-layout-1.html">Counter Layout 01</a></li>
-                                                    <li><a href="counter-layout-2.html">Counter Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                            <li class="dropdown"><a href="#">Pricing Layout</a>
-                                                <ul>
-                                                    <li><a href="pricing-layout-1.html">Pricing Layout 01</a></li>
-                                                    <li><a href="pricing-layout-2.html">Pricing Layout 02</a></li>
-                                                </ul>
-                                            </li>
-                                        </ul>
-                                    </li>
-                                    <li class="dropdown"><a href="#">Latest News</a>
-                                        <ul>
-                                            <li><a href="blog.html">Latest News</a></li>
-                                            <li><a href="blog-details.html">News Details</a></li>
-                                        </ul>
-                                    </li>
-                                    <li><a href="contact.html">Contact</a></li>
-                                </ul>
-                            </div>
-                        </nav>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!--sticky Header-->
-        <div class="sticky-header">
-            <div class="container clearfix">
-                <figure class="logo-box"><a href="index.html"><img src="images/small-logo.png" alt=""></a></figure>
-                <div class="menu-area">
-                    <nav class="main-menu clearfix">
-                        <!--Keep This Empty / Menu will come through Javascript-->
-                    </nav>
-                </div>
-            </div>
-        </div>
-    </header>
-    <!-- main-header end -->
-
-    <!-- Mobile Menu  -->
-    <div class="mobile-menu">
-        <div class="menu-backdrop"></div>
-        <div class="close-btn"><i class="fas fa-times"></i></div>
-
-        <nav class="menu-box">
-            <div class="nav-logo"><a href="index.html"><img src="images/logo.png" alt="" title=""></a></div>
-            <div class="menu-outer"><!--Here Menu Will Come Automatically Via Javascript / Same Menu as in Header--></div>
-            <div class="contact-info">
-                <h4>Contact Info</h4>
-                <ul>
-                    <li>Chicago 12, Melborne City, USA</li>
-                    <li><a href="tel:+8801682648101">+88 01682648101</a></li>
-                    <li><a href="mailto:info@example.com">info@example.com</a></li>
-                </ul>
-            </div>
-            <div class="social-links">
-                <ul class="clearfix">
-                    <li><a href="#"><span class="fab fa-twitter"></span></a></li>
-                    <li><a href="#"><span class="fab fa-facebook-square"></span></a></li>
-                    <li><a href="#"><span class="fab fa-pinterest-p"></span></a></li>
-                    <li><a href="#"><span class="fab fa-instagram"></span></a></li>
-                    <li><a href="#"><span class="fab fa-youtube"></span></a></li>
-                </ul>
-            </div>
-        </nav>
-    </div><!-- End Mobile Menu -->
-
-
-    <!-- banner-section -->
-    <section class="banner-section">
-        <div class="bg-layer" style="background-image: url(images/icons/banner-1.png);"></div>
-        <div class="pattern-bg" style="background-image: url(images/icons/vactor-1.png);"></div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                    <div class="content-box">
-                        <h1>Profect App For Boost Your Business</h1>
-                        <div class="text">The collapse of the online-advertising market in 2001 made marketing on the Internet seem even less compelling.</div>
-                        <div class="btn-box"><a href="#">Get App Now</a></div>
-                    </div>
-                </div>
-                <div class="col-lg-6 col-md-12 col-sm-12 image-column">
-                    <div class="image-box float-bob-y clearfix">
-                        <figure class="image image-1 wow fadeInUp" data-wow-delay="900ms" data-wow-duration="1500ms"><img src="images/resource/phone-1.png" alt=""></figure>
-                        <figure class="image image-2 wow fadeInUp" data-wow-delay="1500ms" data-wow-duration="1500ms"><img src="images/resource/phone-2.png" alt=""></figure>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- banner-section end -->
-
-
-    <!-- feature-section -->
-    <section class="feature-section">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-5 col-md-12 col-sm-12 image-column">
-                    <div id="iamge_block_01">
-                        <div class="image-box float-bob-y">
-                            <figure class="image wow slideInLeft" data-wow-delay="00ms" data-wow-duration="1500ms"><img src="images/resource/phone-3.png" alt=""></figure>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-7 col-md-12 col-sm-12 content-column">
-                    <div id="content_block_01">
-                        <div class="content-box">
-                            <div class="sec-title">
-                                <h2>Amazing Features</h2>
-                                <p>Cumque adipisci anim quisque provident posuere blandit accumsan delectus quam quos interdum sociosqu.</p>
-                            </div>
-                            <div class="inner-box wow fadeInUp" data-wow-delay="00ms" data-wow-duration="1500ms">
-                                <div class="row">
-                                    <div class="col-lg-6 col-md-6 col-sm-12 single-column">
-                                        <div class="single-item">
-                                            <div class="bg-layer" style="background-image: url(images/resource/case-1.png);"></div>
-                                            <div class="icon-box"><i class="flaticon-app-1"></i></div>
-                                            <h5><a href="#">Unique Design</a></h5>
-                                            <div class="text">Integer quis mollis lacus maecenas in ornare ex sed scelerisque nec elit nec vehicula duis pretium libero</div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 col-sm-12 single-column">
-                                        <div class="single-item wow fadeInUp" data-wow-delay="300ms" data-wow-duration="1500ms">
-                                            <div class="bg-layer" style="background-image: url(images/resource/case-1.png);"></div>
-                                            <div class="icon-box"><i class="flaticon-target"></i></div>
-                                            <h5><a href="#">Easy And New Project</a></h5>
-                                            <div class="text">Integer quis mollis lacus maecenas in ornare ex sed scelerisque nec elit nec vehicula duis pretium libero</div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 col-sm-12 single-column">
-                                        <div class="single-item wow fadeInUp" data-wow-delay="600ms" data-wow-duration="1500ms">
-                                            <div class="bg-layer" style="background-image: url(images/resource/case-1.png);"></div>
-                                            <div class="icon-box"><i class="flaticon-shipping"></i></div>
-                                            <h5><a href="#">Track Anything</a></h5>
-                                            <div class="text">Integer quis mollis lacus maecenas in ornare ex sed scelerisque nec elit nec vehicula duis pretium libero</div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 col-sm-12 single-column">
-                                        <div class="single-item wow fadeInUp" data-wow-delay="900ms" data-wow-duration="1500ms">
-                                            <div class="bg-layer" style="background-image: url(images/resource/case-1.png);"></div>
-                                            <div class="icon-box"><i class="flaticon-dashboard"></i></div>
-                                            <h5><a href="#">Unlimited Dashboard</a></h5>
-                                            <div class="text">Integer quis mollis lacus maecenas in ornare ex sed scelerisque nec elit nec vehicula duis pretium libero</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- feature-section -->
-
-
-    <!-- feature-style-two -->
-    <section class="feature-style-two centred">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-4 col-md-6 col-sm-12 feature-block">
-                    <div class="feature-block-one wow flipInY animated" data-wow-delay="00ms" data-wow-duration="1500ms">
-                        <div class="inner-box js-tilt">
-                            <div class="hover-content"></div>
-                            <div class="icon-box">
-                                <div class="bg-layer" style="background-image: url(images/icons/feature-icon-1.png);"></div>
-                                <i class="flaticon-smartphone"></i>
-                            </div>
-                            <h5><a href="#">Flexiable to Use</a></h5>
-                            <div class="text">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum.</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-4 col-md-6 col-sm-12 feature-block">
-                    <div class="feature-block-one wow flipInY animated" data-wow-delay="300ms" data-wow-duration="1500ms">
-                        <div class="inner-box js-tilt">
-                            <div class="hover-content"></div>
-                            <div class="icon-box">
-                                <div class="bg-layer" style="background-image: url(images/icons/feature-icon-2.png);"></div>
-                                <i class="flaticon-seo-and-web"></i>
-                            </div>
-                            <h5><a href="#">Fully Responsive</a></h5>
-                            <div class="text">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum.</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-4 col-md-6 col-sm-12 feature-block">
-                    <div class="feature-block-one wow flipInY animated" data-wow-delay="600ms" data-wow-duration="1500ms">
-                        <div class="inner-box js-tilt">
-                            <div class="hover-content"></div>
-                            <div class="icon-box">
-                                <div class="bg-layer" style="background-image: url(images/icons/feature-icon-3.png);"></div>
-                                <i class="flaticon-app"></i>
-                            </div>
-                            <h5><a href="#">Easy to Customize</a></h5>
-                            <div class="text">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum.</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- feature-style-two end -->
-
-
-    <!-- feature-style-three -->
-    <section class="feature-style-three">
-        <div class="container">
-            <div class="inner-container">
-                <div class="inner-box">
-                    <div class="row">
-                        <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                            <div id="content_block_02">
-                                <div class="content-box wow fadeInUp" data-wow-delay="300ms" data-wow-duration="1500ms">
-                                    <div class="sec-title"><h2>Mobile Applications Redefined</h2></div>
-                                    <div class="text">
-                                        <p>On the other hand we denounce with righteous indignation and dislike men who are so beguiled and demoralized.</p>
-                                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.</p>
-                                    </div>
-                                    <div class="btn-box"><a href="#" class="theme-btn">Learn More<i class="fas fa-angle-right"></i></a></div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6 col-md-12 col-sm-12 image-column">
-                            <div id="iamge_block_02">
-                                <div class="image-box">
-                                    <div class="bg-layer" style="background-image: url(images/icons/image-shap-1.png);"></div>
-                                    <figure class="image image-1 wow slideInRight" data-wow-delay="300ms" data-wow-duration="1500ms"><img src="images/resource/dashbord-1.jpg" alt=""></figure>
-                                    <figure class="image image-2 wow slideInRight" data-wow-delay="00ms" data-wow-duration="1500ms"><img src="images/resource/dashbord-2.jpg" alt=""></figure>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="inner-box">
-                    <div class="row">
-                        <div class="col-lg-6 col-md-12 col-sm-12 image-column">
-                            <div id="iamge_block_03">
-                                <div class="image-box">
-                                    <div class="bg-layer" style="background-image: url(images/icons/image-shap-2.png);"></div>
-                                    <figure class="image image-1 wow slideInLeft" data-wow-delay="00ms" data-wow-duration="1500ms"><img src="images/resource/dashbord-3.jpg" alt=""></figure>
-                                    <figure class="image image-2 wow slideInLeft" data-wow-delay="300ms" data-wow-duration="1500ms"><img src="images/resource/dashbord-4.jpg" alt=""></figure>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                            <div id="content_block_03">
-                                <div class="content-box wow fadeInUp" data-wow-delay="300ms" data-wow-duration="1500ms">
-                                    <div class="sec-title"><h2>Easy access to business information</h2></div>
-                                    <div class="text">
-                                        <p>On the other hand we denounce with righteous indignation and dislike men who are so beguiled and demoralized.</p>
-                                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.</p>
-                                    </div>
-                                    <div class="btn-box"><a href="#" class="theme-btn">Learn More<i class="fas fa-angle-right"></i></a></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- feature-style-three -->
-
-
-    <!-- video-section -->
-    <section class="video-section">
-        <div class="bg-column" style="background-image: url(images/background/video-bg.jpg);"></div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-6 col-md-12 col-sm-12 video-column">
-                    <div class="video-inner">
-                        <a href="https://www.youtube.com/watch?v=nfP5N9Yc72A&amp;t=28s" class="lightbox-image" data-caption="">
-                            <i class="flaticon-play-button"></i>
-                            <span class="ripple"></span>
-                        </a>
-                    </div>
-                </div>
-                <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                    <div id="content_block_04">
-                        <div class="content-box">
-                            <div class="sec-title"><h2>Video Demo App</h2></div>
-                            <div class="text">Retarget past customers with second-chance offers and reach new audiences with geo-targeted campaigns during peak dining times using Forks’ push notifications.</div>
-                            <div class="btn-box"><a href="#" class="theme-btn-two">Play Video Now</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- video-section end -->
-
-
-    <!-- pricing-section -->
-    <section class="pricing-section centred">
-        <div class="container">
-            <div class="sec-title center">
-                <h2>Our Best Price Plan</h2>
-                <p>We provide best price plan for our customer check the list now<br />and slect now plan.</p>
-            </div>
-            <div class="tabs-box">
-                <div class="tabs-content">
-                    <div class="tab active-tab" id="tab-1">
-                        <div class="row">
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-1.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">Basic</h3>
-                                            <h2 class="price">05.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-2.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">Premium</h3>
-                                            <h2 class="price">25.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                                <li>Phone Support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-3.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">PROFESSIONAL</h3>
-                                            <h2 class="price">50.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                                <li>Phone Support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="tab" id="tab-2">
-                        <div class="row">
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-1.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">Basic</h3>
-                                            <h2 class="price">30.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-2.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">Premium</h3>
-                                            <h2 class="price">60.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                                <li>Phone Support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 pricing-column">
-                                <div class="pricing-block-one">
-                                    <div class="pricing-table">
-                                        <figure class="image"><img src="images/icons/price-icon-3.png" alt=""></figure>
-                                        <div class="table-header">
-                                            <h3 class="title">PROFESSIONAL</h3>
-                                            <h2 class="price">99.00<span>/Mo</span></h2>
-                                        </div>
-                                        <div class="table-content">
-                                            <ul>
-                                                <li>One User</li>
-                                                <li>Ui elements 1000</li>
-                                                <li>E-mail support</li>
-                                                <li>Phone Support</li>
-                                            </ul>
-                                        </div>
-                                        <div class="table-footer">
-                                            <a href="#" class="theme-btn-two">Purchase</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="tab-btn-box">
-                    <ul class="tab-btns tab-buttons clearfix">
-                        <li class="tab-btn active-btn" data-tab="#tab-1">Monthly</li>
-                        <li class="tab-btn" data-tab="#tab-2">Yearly</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- pricing-section end -->
-
-
-    <!-- testimonial-section -->
-    <section class="testimonial-section centred">
-        <div class="image-layer" style="background-image: url(images/icons/testimonial-bg.png);"></div>
-        <div class="container">
-            <div class="sec-title center">
-                <h2>Our Users Review</h2>
-                <p>Trusted by more than 9,000 businesses in 140 countries.<br />all of our resources are free</p>
-            </div>
-            <div class="testimonial-carousel owl-carousel owl-theme">
-                <div class="testimonial-inner">
-                    <div class="row">
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-1.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">TeamSnap</h5>
-                                        <span class="designation">VP of Customer Experience</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-2.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">Steven smith</h5>
-                                        <span class="designation">Programmer Doritibe</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="testimonial-inner">
-                    <div class="row">
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-2.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">Steven smith</h5>
-                                        <span class="designation">Programmer Doritibe</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-1.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">TeamSnap</h5>
-                                        <span class="designation">VP of Customer Experience</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="testimonial-inner">
-                    <div class="row">
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-1.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">TeamSnap</h5>
-                                        <span class="designation">VP of Customer Experience</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6 col-md-6 col-sm-12 testimonial-block">
-                            <div class="testimonial-block-one">
-                                <div class="inner-box">
-                                    <figure class="image-box"><img src="images/resource/testimonial-2.png" alt=""></figure>
-                                    <div class="text">“We don't take ourselves too seriously, but seriously enough to ensure we're creating the best product and experience for our customers. I feel like Help Scout does the same.”</div>
-                                    <div class="author-info">
-                                        <h5 class="name">Steven smith</h5>
-                                        <span class="designation">Programmer Doritibe</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- testimonial-section end -->
-
-
-    <!-- download-section -->
-    <section class="download-section">
-        <div class="bg-layer wow slideInLeft animated" style="background-image: url(images/icons/shap-3.png);"></div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                    <div id="content_block_05">
-                        <div class="content-box wow fadeInUp" data-wow-delay="00ms" data-wow-duration="1500ms">
-                            <div class="sec-title"><h2>Get The App Now!</h2></div>
-                            <div class="text">Have you ever heard the expression,<br />“Do not count your chickens before they hatch?”  Maybe an older, wiser individual</div>
-                            <div class="download-btn">
-                                <a href="#" class="app-store-btn">
-                                    <i class="fab fa-apple"></i>
-                                    <span>Download on the</span>
-                                    App Store
-                                </a>
-                                <a href="#" class="google-play-btn">
-                                    <i class="fab fa-android"></i>
-                                    <span>Get on it</span>
-                                    Google Play
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-6 col-md-12 col-sm-12 image-column">
-                    <div id="iamge_block_04">
-                        <div class="image-box">
-                            <figure class="image image-1 wow slideInUp" data-wow-delay="300ms" data-wow-duration="1500ms"><img src="images/resource/phone-4.png" alt=""></figure>
-                            <figure class="image image-2 wow slideInUp" data-wow-delay="600ms" data-wow-duration="1500ms"><img src="images/resource/phone-5.png" alt=""></figure>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- download-section end -->
-
-
-    <!-- news-section -->
-    <section class="news-section">
-        <div class="container">
-            <div class="sec-title center">
-                <h2>News & Events</h2>
-                <p>Trusted by more than 9,000 businesses in 140 countries.<br />all of our resources are free</p>
-            </div>
-            <div class="row">
-                <div class="col-lg-4 col-md-6 col-sm-12 news-column">
-                    <div class="news-block-one wow flipInY animated" data-wow-delay="00ms" data-wow-duration="1500ms">
-                        <div class="inner-box">
-                            <figure class="image-box"><a href="blog-single.html"><img src="images/resource/news-1.jpg" alt=""></a></figure>
-                            <div class="lower-content">
-                                <div class="post-date"><i class="fas fa-calendar-alt"></i>January 11, 2019</div>
-                                <h3><a href="blog-single.html">Design your apps in your own way Business Startegies</a></h3>
-                                <div class="link-btn"><a href="blog-single.html">Read More</a></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-4 col-md-6 col-sm-12 news-column">
-                    <div class="news-block-one wow flipInY animated" data-wow-delay="300ms" data-wow-duration="1500ms">
-                        <div class="inner-box">
-                            <figure class="image-box"><a href="blog-single.html"><img src="images/resource/news-2.jpg" alt=""></a></figure>
-                            <div class="lower-content">
-                                <div class="post-date"><i class="fas fa-calendar-alt"></i>January 10, 2019</div>
-                                <h3><a href="blog-single.html">We support our user every time and upgarad our app.</a></h3>
-                                <div class="link-btn"><a href="blog-single.html">Read More</a></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-4 col-md-6 col-sm-12 news-column">
-                    <div class="news-block-one wow flipInY animated" data-wow-delay="600ms" data-wow-duration="1500ms">
-                        <div class="inner-box">
-                            <figure class="image-box"><a href="blog-single.html"><img src="images/resource/news-3.jpg" alt=""></a></figure>
-                            <div class="lower-content">
-                                <div class="post-date"><i class="fas fa-calendar-alt"></i>January 09, 2019</div>
-                                <h3><a href="blog-single.html">We developed the app for our customer to easy to use it.</a></h3>
-                                <div class="link-btn"><a href="blog-single.html">Read More</a></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- news-section end -->
-
-
-    <!-- subscribe-section -->
-    <section class="subscribe-section">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-6 col-md-12 col-sm-12 image-column">
-                    <div id="iamge_block_05">
-                        <div class="image-box wow slideInLeft animated" data-wow-delay="00ms" data-wow-duration="1500ms">
-                            <figure class="image float-bob-y"><img src="images/resource/subscribe-1.png" alt=""></figure>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-6 col-md-12 col-sm-12 content-column">
-                    <div id="content_block_06">
-                        <div class="content-box">
-                            <div class="sec-title"><h2>Subscribe our Newsletter</h2></div>
-                            <div class="text">Lorem ipsum dolor sit amet consectetur adipiscing elit donec tempus pellentesque dui vel tristique purus justo</div>
-                            <form action="#" method="post" class="subscribe-form">
-                                <div class="form-group">
-                                    <input type="email" name="email" placeholder="Enter Your Email" required="">
-                                    <button type="submit" class="theme-btn-two">Subscribe Now</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- subscribe-section end -->
-
-
-    <!-- main-footer -->
-    <footer class="main-footer">
-        <div class="image-layer" style="background-image: url(images/icons/footer-bg.png);"></div>
-        <div class="container">
-            <div class="footer-top">
-                <div class="widget-section">
-                    <div class="row">
-                        <div class="col-lg-4 col-md-6 col-sm-12 footer-column">
-                            <div class="about-widget footer-widget">
-                                <figure class="footer-logo"><a href="index.html"><img src="images/footer-logo.png" alt=""></a></figure>
-                                <div class="text">Lorem ipsum dolor sit consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim lorem sed do eiusmod.</div>
-                                <ul class="social-links">
-                                    <li><h6>Follow Us :</h6></li>
-                                    <li><a href="#"><i class="fab fa-facebook-f"></i></a></li>
-                                    <li><a href="#"><i class="fab fa-twitter"></i></a></li>
-                                    <li><a href="#"><i class="fab fa-skype"></i></a></li>
-                                    <li><a href="#"><i class="fab fa-linkedin-in"></i></a></li>
-                                </ul>
-                            </div>
-                        </div>
-                        <div class="col-lg-3 col-md-6 col-sm-12 footer-column">
-                            <div class="links-widget footer-widget">
-                                <h4 class="widget-title">Support</h4>
-                                <div class="widget-content">
-                                    <ul class="list clearfix">
-                                        <li><a href="#">상담 신청</a></li>
-                                        <li><a href="#">Submit a Ticket</a></li>
-                                        <li><a href="#">Visit Knowledge Base</a></li>
-                                        <li><a href="#">Support System</a></li>
-                                        <li><a href="#">Refund Policy</a></li>
-                                        <li><a href="#">Professional Services</a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-2 col-md-6 col-sm-12 footer-column">
-                            <div class="links-widget footer-widget">
-                                <h4 class="widget-title">Links</h4>
-                                <div class="widget-content">
-                                    <ul class="list clearfix">
-                                        <li><a href="#">Home</a></li>
-                                        <li><a href="#">Services</a></li>
-                                        <li><a href="#">Price Plan</a></li>
-                                        <li><a href="#">Testimonials</a></li>
-                                        <li><a href="#">News</a></li>
-                                        <li><a href="#">Contact</a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-3 col-md-6 col-sm-12 footer-column">
-                            <div class="contact-widget footer-widget">
-                                <h4 class="widget-title">Contact Info</h4>
-                                <div class="widget-content">
-                                    <ul class="list clearfix">
-                                        <li><i class="fas fa-map-marker-alt"></i>25 Bedford St.<br />New York City, N.Y.</li>
-                                        <li>
-                                            <i class="fas fa-phone-volume"></i>
-                                            <a href="tel:+0665184575181">(+066) 518 - 457 - 5181</a><br />
-                                            <a href="tel:+0665184575182">(+066) 518 - 457 - 5182</a>
-                                        </li>
-                                        <li>
-                                            <i class="fas fa-envelope"></i>
-                                            <a href="mailto:info@example.com">info@example.com</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="footer-bottom">
-                <div class="copyright">&copy; 2020 <a href="#">appway</a>. All rights reserved</div>
-            </div>
-        </div>
-    </footer>
-    <!-- main-footer end -->
-
-
-
-<!--Scroll to top-->
-<button class="scroll-top scroll-to-target" data-target="html">
-    <span class="fa fa-arrow-up"></span>
-</button>
-
-
-<!-- jequery plugins -->
-<script src="js/jquery.js"></script>
-<script src="js/popper.min.js"></script>
-<script src="js/bootstrap.min.js"></script>
-<script src="js/owl.js"></script>
-<script src="js/wow.js"></script>
-<script src="js/validation.js"></script>
-<script src="js/jquery.fancybox.js"></script>
-<script src="js/appear.js"></script>
-<script src="js/scrollbar.js"></script>
-<script src="js/tilt.jquery.js"></script>
-
-<!-- main-js -->
-<script src="js/script.js"></script>
-
-</body><!-- End of .page_wrapper -->
-</html>

+ 4 - 4
public/js/dashboard/bars.js

@@ -40,7 +40,7 @@ var DashboardBars = function() {
             // Main variables
             var d3Container = d3.select(element),
                 width = d3Container.node().getBoundingClientRect().width;
-            
+
 
 
             // Construct scales
@@ -201,9 +201,9 @@ var DashboardBars = function() {
             sidebarToggle && sidebarToggle.addEventListener('click', barsResize);
 
             // Resize function
-            // 
+            //
             // Since D3 doesn't support SVG resize by default,
-            // we need to manually specify parts of the graph that need to 
+            // we need to manually specify parts of the graph that need to
             // be updated on window resize
             function barsResize() {
 
@@ -246,7 +246,7 @@ var DashboardBars = function() {
         init: function() {
             _BarChart('#hours-available-bars', 24, 40, true, 'elastic', 1200, 50, '#EC407A', 'hours');
             _BarChart('#goal-bars', 24, 40, true, 'elastic', 1200, 50, '#5C6BC0', 'goal');
-            _BarChart('#members-online', 24, 50, true, 'elastic', 1200, 50, 'rgba(255,255,255,0.5)', 'members');
+            // _BarChart('#members-online', 24, 50, true, 'elastic', 1200, 50, 'rgba(255,255,255,0.5)', 'members');
         }
     }
 }();

+ 1 - 1
public/js/dashboard/sparklines.js

@@ -254,7 +254,7 @@ var DashboardSparklines = function() {
             _chartSparkline('#new-visitors', 'line', 30, 35, 'basis', 750, 2000, '#26A69A');
             _chartSparkline('#new-sessions', 'line', 30, 35, 'basis', 750, 2000, '#FF7043');
             _chartSparkline('#total-online', 'line', 30, 35, 'basis', 750, 2000, '#5C6BC0');
-            _chartSparkline('#server-load', 'area', 30, 50, 'basis', 750, 2000, 'rgba(255,255,255,0.5)');
+            // _chartSparkline('#server-load', 'area', 30, 50, 'basis', 750, 2000, 'rgba(255,255,255,0.5)');
         }
     }
 }();

+ 7 - 7
public/js/main/sparklines.js

@@ -63,7 +63,7 @@ var DashboardSparklines = function() {
 
             // Vertical
             y.domain([0, qty])
-                
+
 
 
             // Construct chart layout
@@ -78,12 +78,12 @@ var DashboardSparklines = function() {
             // Area
             var area = d3.svg.area()
                 .interpolate(interpolation)
-                .x(function(d, i) { 
-                    return x(i); 
+                .x(function(d, i) {
+                    return x(i);
                 })
                 .y0(height)
-                .y1(function(d) { 
-                    return y(d); 
+                .y1(function(d) {
+                    return y(d);
                 });
 
 
@@ -206,9 +206,9 @@ var DashboardSparklines = function() {
             sidebarToggle && sidebarToggle.addEventListener('click', resizeSparklines);
 
             // Resize function
-            // 
+            //
             // Since D3 doesn't support SVG resize by default,
-            // we need to manually specify parts of the graph that need to 
+            // we need to manually specify parts of the graph that need to
             // be updated on window resize
             function resizeSparklines() {
 

+ 27 - 8
public/js/utils/lib.js

@@ -568,6 +568,33 @@ function format_func_condition_type_rev(value, data) {
     return _.first(condition_type)['Code'];
 }
 
+function format_func_condition_type(value, data) {
+    if (window.CodeTitle['condition-type'] && window.CodeTitle['condition-type'][value][data]) {
+        return window.CodeTitle['condition-type'][value][data]['Title'];
+    }
+
+    return 'Invalid';
+}
+
+function format_func_body_situation_update(value, data) {
+    return { Field: 'BodySituation', Value: format_func_body_situation_rev(value, data),  };
+}
+
+function format_func_body_situation_rev(value, data) {
+    const body_situation = Object.values(window.CodeTitle['body-situation'][value]).filter(body_situation => body_situation.Title == data)
+    if (isEmptyArr(body_situation)) { return data;  }
+
+    return _.first(body_situation)['Code'];
+}
+
+function format_func_body_situation(value, data) {
+    if (window.CodeTitle['body-situation'] && window.CodeTitle['body-situation'][value][data]) {
+        return window.CodeTitle['body-situation'][value][data]['Title'];
+    }
+
+    return 'Invalid';
+}
+
 function formatPhoneNumber(phoneNumber) {
     // Remove any non-numeric characters
     let cleaned = phoneNumber.replace(/\D/g, '');
@@ -581,14 +608,6 @@ function formatPhoneNumber(phoneNumber) {
     }
 }
 
-function format_func_condition_type(value, data) {
-    if (window.CodeTitle['condition-type'] && window.CodeTitle['condition-type'][value][data]) {
-        return window.CodeTitle['condition-type'][value][data]['Title'];
-    }
-
-    return 'Invalid';
-}
-
 function check_dom_input_number(dom_array) {
     let arr = dom_array.filter(el => isNaN($(el).val()))
 

+ 1 - 1
resources/views/dbrbbs/details.blade.php

@@ -33,7 +33,7 @@
 									<span>{{ $post['C11'] }}</span>
                                 </li>
                             </ul>
-							<h2 class="blog-details-title">{{ $post['C5'] }}</h2>
+							<h1 class="blog-details-title">{{ $post['C5'] }}</h1>
 							<div class="blog_cont_wrap">
                                 {!! $post['C6'] !!}
                             </div>

+ 1 - 1
resources/views/dbrbbs/list.blade.php

@@ -4,7 +4,7 @@
     <div class="sub_wrap blog movie">
 
         <div class="title">
-            <h2>{{ $postType['C7'] }}</h2>
+            <h1>{{ $postType['C7'] }}</h1>
         </div>
 
         <div class="blog-grid">

+ 3 - 3
resources/views/front/dabory/erp/accounting/acc-slip-form.blade.php

@@ -453,9 +453,9 @@
             $('#acc-slip-form').find('#supplier-txt').prop('readonly',  hd_page.CompanyName != "")
             $('#acc-slip-form').find('.company-modal-btn').prop('disabled',  hd_page.CompanyName != "")
             $('#acc-slip-form').find('#sorder-no-txt').prop('readonly',  hd_page.SorderNo != "")
-            $('#acc-slip-form').find('.sorder-modal-btn').prop('disabled',  hd_page.SorderNo != "")
-            $('#acc-slip-form').find('#porder-no-txt').prop('readonly',  hd_page.PorderNo != "")
-            $('#acc-slip-form').find('.porder-modal-btn').prop('disabled',  hd_page.PorderNo != "")
+            $('#acc-slip-form').find('.sorder-modal-btn').prop('disabled',  hd_page.SorderId != 0)
+            $('#acc-slip-form').find('#porder-no-txt').prop('readonly',  hd_page.PorderId != 0)
+            $('#acc-slip-form').find('.porder-modal-btn').prop('disabled',  hd_page.PorderId != 0)
 
 
             $('#acc-slip-form').find('#deal-type-select').val(hd_page.DealTypeId)

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

@@ -0,0 +1,175 @@
+@extends('layouts.master')
+@section('title', $formA['General']['Title'])
+@section('content')
+    <div class="content">
+        <div class="row">
+            <div class="col-xl-12">
+                <div class="card" id="monthly-settle-form">
+                    <div class="card-body mt-2" id="frm">
+                        <input type="hidden" id="Id" name="Id" value="0">
+                        <div class="d-flex align-items-center mb-2">
+                            <input type="checkbox" value="bal_buyer" class="text-center mr-1" id="is-bal-buyer-check" checked>
+                            <label class="mb-0" for="is-bal-buyer-check">{{ $formA['FormVars']['Title']['IsBalBuyer'] }}</label>
+                        </div>
+                        <div class="d-flex align-items-center mb-2">
+                            <input type="checkbox" value="bal_supplier" class="text-center mr-1" id="is-bal-supplier-check" checked>
+                            <label class="mb-0" for="is-bal-supplier-check">{{ $formA['FormVars']['Title']['IsBalSupplier'] }}</label>
+                        </div>
+                        <div class="d-flex align-items-center mb-2">
+                            <input type="checkbox" value="bal_item" class="text-center mr-1" id="is-bal-item-check" checked>
+                            <label class="mb-0" for="is-bal-item-check">{{ $formA['FormVars']['Title']['IsBalItem'] }}</label>
+                        </div>
+                        <div class="d-flex align-items-center mb-2">
+                            <input type="checkbox" value="bal_reward" class="text-center mr-1" id="is-bal-reward-check" checked>
+                            <label class="mb-0" for="is-bal-reward-check">{{ $formA['FormVars']['Title']['IsBalReward'] }}</label>
+                        </div>
+                        <div class="d-flex align-items-center mb-2">
+                            <input type="checkbox" value="bal_credit" class="text-center mr-1" id="is-bal-credit-check" checked>
+                            <label class="mb-0"
+                            for="is-bal-credit-check">{{ $formA['FormVars']['Title']['IsBalCredit'] }}</label>
+                        </div>
+
+                        <div class="form-group mb-3" {{ $formA['FormVars']['Hidden']['YyyyMm'] }}>
+                            <label class="m-0">{{ $formA['FormVars']['Title']['YyyyMm'] }}</label>
+                            <br>
+                            <input type="text" class="rounded w-sm-auto" id="yyyy-txt" data-copy="true"
+                                maxlength="{{ $formA['FormVars']['MaxLength']['YyyyMm'] }}"
+                                {{ $formA['FormVars']['Required']['YyyyMm'] }}>&nbsp;&nbsp;년&nbsp;&nbsp;
+                            @php $todayMonth = date('n');@endphp
+                            <select id = "mm-select" class="rounded">
+                                @foreach($monthArr as $index => $month)
+                                    <option value="{{ $index + 1 }}" @if($todayMonth == $index + 1) selected @endif>
+                                        {{ $month }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-sm btn-primary monthly-settle"
+                                    data-value="re_calculation"
+                                    {{ $formA['FormVars']['Hidden']['ReCalulationButton'] }}>
+                                    {{ $formA['FormVars']['Title']['ReCalulationButton'] }}
+                            </button>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+
+@section('js')
+<script src="{{ csset('/js/modals-controller/a-type/common.js') }}"></script>
+<script>
+    $(document).ready(async function() {
+        $('.monthly-settle').on('click', function () {
+            switch( $(this).data('value') ) {
+                case 're_calculation': MonthlySettleForm.btn_re_cal('#monthly-settle-form #frm', undefined, 'MonthlySettleForm'); break;
+            }
+        });
+
+    });
+
+    (function( MonthlySettleForm, $, undefined ) {
+        MonthlySettleForm.formA = {!! json_encode($formA) !!};
+
+        MonthlySettleForm.parameter = function () {
+            let id = Number($('#monthly-settle-form').find('#Id').val());
+            const yyyy = $('#monthly-settle-form').find('#yyyy-txt').val();
+            const mm = $('#monthly-settle-form').find('#mm-select').val();
+            const parameters = [];
+
+            $('#monthly-settle-form').find('input[type="checkbox"]:checked').each(function() {
+                parameters.push({
+                    TableName: $(this).val(),
+                    BalYyyyMm: yyyy+mm
+                });
+            });
+
+            // console.log(parameters);
+            return parameters;
+        }
+
+        MonthlySettleForm.fetch_monthly_settle = async function (id) {
+            let response = await get_api_data(MonthlySettleForm.formA['General']['PickApi'], {
+                Page: [ { Id: id } ]
+            })
+
+            MonthlySettleForm.set_monthly_settle_ui(response)
+        }
+
+        MonthlySettleForm.set_monthly_settle_ui = function (response) {
+            if (isEmpty(response.data) || response.data.apiStatus) {
+                $('#modal-setting_monthly_settle').modal('hide');
+                return;
+            }
+
+            let monthly_settle = response.data.Page[0];
+
+            $('#monthly-settle-form').find('#Id').val(monthly_settle.Id)
+            $('#monthly-settle-form').find('#monthly_settle-name-txt').val(monthly_settle.IgroupName)
+            $('#monthly-settle-form').find('#monthly_settle-code-txt').val(monthly_settle.IgroupCode)
+            $('#monthly-settle-form').find('#monthly_settle-slug-txt').val(monthly_settle.IgroupSlug)
+
+            $('#modal-setting_monthly_settle').modal('hide');
+        }
+
+        MonthlySettleForm.change_tbl_name = async function (tbl_name) {
+            let check_name;
+            switch(tbl_name){
+                case "bal_buyer":
+                    check_name = "{{ $formA['FormVars']['Title']['IsBalBuyer'] }}"
+                    break;
+                case "bal_supplier":
+                    check_name = "{{ $formA['FormVars']['Title']['IsBalSupplier'] }}"
+                    break;
+                case "bal_item":
+                    check_name = "{{ $formA['FormVars']['Title']['IsBalItem'] }}"
+                    break;
+                case "bal_reward":
+                    check_name = "{{ $formA['FormVars']['Title']['IsBalReward'] }}"
+                    break;
+                case "bal_credit":
+                    check_name = "{{ $formA['FormVars']['Title']['IsBalCredit'] }}"
+                    break;
+            }
+            return check_name;
+        }
+
+        MonthlySettleForm.check_input = async function (parameters) {
+            if ($('#yyyy-txt').val() == '') {
+                return iziToast.error({ title: 'Error', message: '정산년도를 입력해주세요. ex)2024' });
+            }
+            if(parameters.length == 0){
+                return iziToast.error({ title: 'Error', message: '체크박스를 1개이상 체크해주세요.' });
+            }
+        }
+
+        MonthlySettleForm.btn_re_cal = async function () {
+            const parameters = MonthlySettleForm.parameter();
+            MonthlySettleForm.check_input(parameters);
+
+            for (const parameter of parameters) {
+                const response = await get_api_data('monthly-settle', parameter);
+                // const table_name = parameter['TableName'];
+                const table_name = await MonthlySettleForm.change_tbl_name(parameter['TableName']);
+                console.log('table_name : ', table_name);
+                if (response && response.data.apiStatus) {
+                    const status = response.data.apiStatus;
+                    const message = response.data.body;
+                    console.log(response);
+                    return iziToast.error({ title: 'Error', message: `${table_name} : ${status}, ${message}` });
+                }
+
+                iziToast.success({ title: 'Success', message: `${table_name} 완료` });
+                // console.log(response);
+            }
+        };
+
+    }( window.MonthlySettleForm = window.MonthlySettleForm || {}, jQuery ));
+
+</script>
+@endsection

+ 18 - 4
resources/views/front/dabory/erp/coupon-credit/credit.blade.php

@@ -80,7 +80,7 @@
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['ToCustomer'] }}"
                                                 {{ $formB['FormVars']['Required']['ToCustomer'] }}>
                                             <button type="button"
-                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 customer-modal-btn"
+                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 to-customer-modal-btn"
                                                 data-target="company"
                                                 data-clicked="get_override_to_customer_id"
                                                 data-variable="customerModal">
@@ -95,7 +95,7 @@
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['FormCustomer'] }}"
                                                 {{ $formB['FormVars']['Required']['FormCustomer'] }}>
                                             <button type="button"
-                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3"
+                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 form-customer-modal-btn"
                                                 data-target="company"
                                                 data-clicked="get_override_form_customer_id"
                                                 data-variable="customerModal">
@@ -365,8 +365,11 @@
             $('#form-customer-txt').data('id', 0)
             $('.coupon-credit').find('.form-customer-group').removeClass('d-flex');
             $('.coupon-credit').find('.form-customer-group').addClass('d-none');
+
             $('#to-customer-txt').prop('readonly', false);
-            $('.customer-modal-btn').prop('disabled', false);
+            $('#form-customer-txt').prop('readonly', false);
+            $('.to-customer-modal-btn').prop('disabled', false);
+            $('.form-customer-modal-btn').prop('disabled', false);
             $('.credit-act.save-button').prop('disabled', false)
 
             Btype.set_slip_no_btn_abled()
@@ -481,6 +484,9 @@
                         class="text-${formB.ListVars['Align'].$Radio}"
                         onclick="Btype.bd_cursor_click(this)">
                     </td>
+                    <td class="text-${formB.ListVars['Align'].CompanyNo}" ${formB.ListVars['Hidden'].CompanyNo}>
+                        ${format_conver_for(bd.CompanyNo, formB.ListVars['Format'].CompanyNo)}
+                    </td>
                     <td class="text-${formB.ListVars['Align'].Customer}" ${formB.ListVars['Hidden'].Customer}>
                         ${format_conver_for(bd.CompanyName, formB.ListVars['Format'].Customer)}
                     </td>
@@ -521,6 +527,12 @@
             let hd_page = response.data.HdPage[0]
             bd_page = response.data.BdPage ?? []
 
+            bd_page.forEach(bd => {
+                if (hd_page.FromBuyerId === bd.BuyerId) {
+                    bd.RewardAmt = -Math.abs(bd.RewardAmt);
+                }
+            });
+
             $('#Id').val(hd_page.Id)
             $('#auto-slip-no-txt').val(hd_page.CreditNo)
             $('#credit-date').val(moment(to_date(hd_page.CreditDate)).format('YYYY-MM-DD'))
@@ -536,7 +548,9 @@
             $('#form-customer-txt').data('id', hd_page.FromBuyerId)
             // 저장된 데이터 불러올 경우 고객업체 비활성화
             $('#to-customer-txt').prop('readonly',  hd_page.ToCompanyName != "")
-            $('.customer-modal-btn').prop('disabled',  hd_page.ToCompanyName != "")
+            $('#form-customer-txt').prop('readonly',  hd_page.FromCompanyName != "")
+            $('.to-customer-modal-btn').prop('disabled',  hd_page.ToCompanyName != "")
+            $('.form-customer-modal-btn').prop('disabled',  hd_page.FromCompanyName != "")
 
             $('#remarks-txt-area').val(remove_tag(hd_page.Remarks))
             $('#remarks-preview').html(hd_page.Remarks)

+ 31 - 9
resources/views/front/dabory/erp/coupon-credit/reward.blade.php

@@ -80,7 +80,7 @@
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['ToCustomer'] }}"
                                                 {{ $formB['FormVars']['Required']['ToCustomer'] }}>
                                             <button type="button"
-                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 customer-modal-btn"
+                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 form-customer-modal-btn"
                                                 data-target="company"
                                                 data-clicked="get_override_to_customer_id"
                                                 data-variable="customerModal">
@@ -95,7 +95,7 @@
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['FormCustomer'] }}"
                                                 {{ $formB['FormVars']['Required']['FormCustomer'] }}>
                                             <button type="button"
-                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3"
+                                                class="btn-dark rounded btn-open-modal border-0 radius-l0 col-3 to-customer-modal-btn"
                                                 data-target="company"
                                                 data-clicked="get_override_form_customer_id"
                                                 data-variable="customerModal">
@@ -307,7 +307,7 @@
             }))
             .done(function(response) {
                 let d = response.data
-                console.log('response : ', response);
+                console.log(response);
                 if (d.Page) {
                     set_as_response_id(d.Page[0].Id)
                     callback();
@@ -370,9 +370,11 @@
             $('.coupon-reward').find('.form-customer-group').addClass('d-none');
 
             $('#to-customer-txt').prop('readonly', false);
-            $('.customer-modal-btn').prop('disabled', false);
-            $('.reward-act.save-button').prop('disabled', false)
+            $('#form-customer-txt').prop('readonly', false);
+            $('.to-customer-modal-btn').prop('disabled', false);
+            $('.form-customer-modal-btn').prop('disabled', false);
 
+            $('.reward-act.save-button').prop('disabled', false)
             Btype.set_slip_no_btn_abled()
             $('#reward-date').val(date_to_sting(new Date()))
 
@@ -474,8 +476,10 @@
         function create_bd_page() {
             let html = []
             let sum_total = 0;
-            bd_page.forEach(bd => {
-                sum_total += parseFloat(bd.CreditAmt);
+
+            bd_page.forEach((bd, index) => {
+                console.log('bd.CreditAmt('+index+') : ', bd.RewardAmt);
+                sum_total += parseFloat(bd.RewardAmt);
 
                 // 품목코드, 수량, 단가, 공급가액, 세액, 합계금액
                 html.push (
@@ -485,6 +489,9 @@
                         class="text-${formB.ListVars['Align'].$Radio}"
                         onclick="Btype.bd_cursor_click(this)">
                     </td>
+                    <td class="text-${formB.ListVars['Align'].CompanyNo}" ${formB.ListVars['Hidden'].CompanyNo}>
+                        ${format_conver_for(bd.CompanyNo, formB.ListVars['Format'].CompanyNo)}
+                    </td>
                     <td class="text-${formB.ListVars['Align'].Customer}" ${formB.ListVars['Hidden'].Customer}>
                         ${format_conver_for(bd.CompanyName, formB.ListVars['Format'].Customer)}
                     </td>
@@ -515,7 +522,7 @@
         }
 
         function update_hd_ui(response) {
-            console.log('update_hd_ui : ', response);
+            console.log(response);
             if (isEmpty(response.data) || response.data.apiStatus) {
                 $('#modal-slip').modal('hide');
                 return;
@@ -523,7 +530,10 @@
 
             let hd_page = response.data.HdPage[0]
             bd_page = response.data.BdPage ?? []
+            // console.log('bd_page : ', bd_page);
+            // console.log('hd_page.id : ', hd_page.Id);
 
+            $('.save-button').prop('disabled', true);
             $('#Id').val(hd_page.Id)
             $('#auto-slip-no-txt').val(hd_page.RewardNo)
             $('#reward-date').val(moment(to_date(hd_page.RewardDate)).format('YYYY-MM-DD'))
@@ -539,13 +549,25 @@
             $('#form-customer-txt').data('id', hd_page.FromBuyerId)
             // 저장된 데이터 불러올 경우 고객업체 비활성화
             $('#to-customer-txt').prop('readonly',  hd_page.ToCompanyName != "")
-            $('.customer-modal-btn').prop('disabled',  hd_page.ToCompanyName != "")
+            $('#form-customer-txt').prop('readonly',  hd_page.FromCompanyName != "")
+            $('.to-customer-modal-btn').prop('disabled',  hd_page.ToCompanyName != "")
+            $('.form-customer-modal-btn').prop('disabled',  hd_page.FromCompanyName != "")
 
             $('#remarks-txt-area').val(remove_tag(hd_page.Remarks))
             $('#remarks-preview').html(hd_page.Remarks)
 
             $('#sgroup-id-select').val(hd_page.SgroupId)
             $('#our-contact-select').val(hd_page.OurContact)
+
+            if($('#is-transfer-check').val() == 1){
+                bd_page.forEach(bd => {
+                    // 전송처리시 주는고객 적립금 - 처리
+                    if (hd_page.FromBuyerId === bd.BuyerId) {
+                        bd.RewardAmt = -Math.abs(bd.RewardAmt);
+                    }
+                });
+            }
+
             Btype.set_slip_no_btn_disabled()
             // table body에 데이터 추가
             create_bd_page();

+ 1 - 1
resources/views/front/dabory/erp/list-type/list1-form.blade.php

@@ -26,7 +26,7 @@
 
 <div class="tab-content" id="list1-form">
 @isset ($list1['TabOptions'])
-    <div class="tab-pane fade active show" id="{{ $list1['TabOptions'][0]['Value'] }}">
+    <div class="tab-pane fade {{ $list1['TabOptions'][0]['Value'] === 'basic' ? 'active show' : '' }}" id="{{ $list1['TabOptions'][0]['Value'] }}">
 @endisset
         <div class="card mb-1" {{ $list1['FormVars']['Hidden']['HeadFirst'] }}>
             <div class="row text-center">

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

@@ -255,8 +255,8 @@
 
         function converter_setup_data(popup_option) {
             if(isThemeSetup){
-                const dabory_path = "{{ daboryPath('themes/' . env('DBR_THEME')) . '/erp/resources'}}";
-                popup_option['BladeRoute'] = `${popup_option['Component']}`;
+                const dabory_path = "{{ daboryPath('themes/' . env('DBR_THEME'))}}";
+                popup_option['BladeRoute'] = `.erp.resources.views.${popup_option['Component']}`;
             }else{
                 popup_option['BladeRoute'] = `front.dabory.erp.${popup_option['Component']}`;
             }

+ 134 - 0
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

+ 1 - 4
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;"

+ 96 - 0
resources/views/front/dabory/erp/popup/popup-list1/form-tab/sorder-bd-pro-no-total.blade.php

@@ -0,0 +1,96 @@
+<div class="tab-pane fade active show" id="body-situation">
+    <input type="hidden" id="Id" name="Id" value="0">
+    <div class="card-header p-0 mr-1">
+        <div class="row">
+            <div class="col-7 pr-0 card-header-item">
+                <div class="card card card-primary mb-3 mb-md-2 mb-lg-0 border-light">
+                    <div class="card-body">
+                        <div class="d-flex flex-column mb-2">
+                            <label class="m-0 font-weight-bold">클레임 처리</label>
+                            <div class="title-br"></div>
+                            @php
+                                $situationList = collect($codeTitle['body-situation']['sorder-bd'])->filter(function ($situation) {
+                                    return $situation['Code'] !== '';
+                                })->map(function ($situation) {
+                                    return array_merge($situation, ['Unique' => $situation['Code'][0]]);
+                                })->groupBy('Unique')->toArray();
+                            @endphp
+                            @foreach ($situationList as $chunk)
+                                <div class="d-flex align-items-center mb-2">
+                                    @forelse ($chunk as $key => $situation)
+                                        @if ($situation['Code'] !== '' && $situation['Code'] !== 'ETC' && $situation['Code'] !== '')
+                                            <div class="d-flex align-items-center mr-3">
+                                                <input type="radio" name="body_situation" value="{{ $situation['Code'] }}" class="text-center mr-1" id="list-situation-radio-{{ $situation['Code'] }}">
+                                                <label class="mb-0" for="list-situation-radio-{{ $situation['Code'] }}">
+                                                    {{ $situation['Title'] }}
+                                                </label>
+                                            </div>
+                                        @endif
+                                    @empty
+                                    @endforelse
+                                </div>
+                            @endforeach
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-5 px-1 card-header-item">
+                <div class="card card card-primary mb-3 mb-md-2 mb-lg-0 border-light">
+                    <div class="card-body">
+                        <div class="d-flex flex-column mb-2">
+                            <label class="m-0 font-weight-bold">클레임 사유</label>
+                            <div class="title-br"></div>
+                            <textarea id="body_situation_notes" style="height: 91px;"></textarea>
+{{--                            <input type="text" class="rounded w-100" id="situation_notes">--}}
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<script>
+    $(document).ready(async function() {
+    });
+
+    (function( ListTypeList1FromTab, $, undefined ) {
+        ListTypeList1FromTab.save = async function () {
+            const response = await get_api_data('sorder-bd-act', {
+                Page : [
+                    ListTypeList1FromTab.getParameter()
+                ]
+            })
+
+            show_iziToast_msg(response.data, function () {
+                $('#modal-select-popup.show').trigger('list.requery');
+                // ListTypeList1FromTab.ui($('#delivery').find(`input[name="Id"]`).val())
+            })
+        }
+
+        ListTypeList1FromTab.getParameter = function () {
+            let id = parseInt($('#body-situation').find(`input[name="Id"]`).val());
+            let parameter = {
+                Id: id,
+                BodySituation: $('#body-situation').find(`input:radio[name=body_situation]:checked`).val(),
+                BodySituationNotes: $('#body-situation').find('#body_situation_notes').val(),
+            }
+
+            // console.log(parameter)
+            return parameter;
+        }
+
+        ListTypeList1FromTab.ui = async function (id) {
+            let response = await get_api_data('sorder-bd-pick', {
+                Page : [ { Id: Number(id) } ]
+            })
+            const sorder_bd = response.data.Page[0]
+            $('#body-situation').find(`input[name="Id"]`).val(sorder_bd['Id'])
+            $('#body-situation').find(`input:radio[name=body_situation]:input[value='${sorder_bd['BodySituation']}']`).prop('checked', true)
+            $('#body-situation').find('#body_situation_notes').val(sorder_bd['BodySituationNotes'])
+        }
+
+    }( window.ListTypeList1FromTab = window.ListTypeList1FromTab || {}, jQuery ));
+
+</script>

+ 1 - 1
resources/views/pages/generic_dash.blade.php

@@ -9,7 +9,7 @@
 
 
     <script src="{{ csset('/js/dashboard/echarts.min.js') }}"></script>
-    {{-- <script src="/js/dashboard/dashboard.js"></script> --}}
+     <script src="{{ csset('/js/dashboard/dashboard.js') }}"></script>
     <script src="{{ csset('/js/dashboard/streamgraph.js') }}"></script>
     <script src="{{ csset('/js/dashboard/sparklines.js') }}"></script>
     <script src="{{ csset('/js/dashboard/lines.js') }}"></script>

+ 1 - 0
routes/dabory.php

@@ -51,6 +51,7 @@ Route::middleware(['check.gate.token', 'app.token.manager'])->group(function ()
         Route::get('/dabory/erp/basic-settings/branch', Utils::makeFrontRoute('/dabory/erp/basic-settings/branch'));
         Route::get('/dabory/erp/basic-settings/my-users', Utils::makeFrontRoute('/dabory/erp/basic-settings/my-users'));
         Route::get('/dabory/erp/basic-settings/item-optpro', Utils::makeFrontRoute('/dabory/erp/basic-settings/item-optpro'));
+        Route::get('/dabory/erp/basic-settings/monthly-settle', Utils::makeFrontRoute('/dabory/erp/basic-settings/monthly-settle'));
 
         Route::get('/dabory/erp/list-type/list-media1', Utils::makeFrontRoute('/dabory/erp/list-type/list-media1'));
         Route::get('/dabory/erp/etc/media', Utils::makeFrontRoute('/dabory/erp/etc/media'));

+ 1 - 1
routes/web.php

@@ -202,7 +202,7 @@ Route::get('/user-clear-cache', function () {
     Storage::deleteDirectory('dabory-footage/pro');
     Storage::deleteDirectory('dabory-footage/basic/slip-form-init');
 
-    Storage::deleteDirectory('dabory-footage/member');
+    Storage::deleteDirectory('dabory-footage/members');
     ProApiCacheFacade::deleteCachedDirectory();
 
     app(\App\Services\CacheService::class)->putMainMenu();

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä