From d0ac5f96200527b4dc44bad526ef8acf1cabb1db Mon Sep 17 00:00:00 2001 From: younghyeong ryu Date: Fri, 27 Dec 2024 18:54:10 +0900 Subject: [PATCH] t t --- README.md | 2 +- src/Console/InstallsBladeStack.php | 4 +- .../Admin/CancelReturnExchangeController.php | 13 ++- .../Admin/Config/BankController.php | 16 +-- .../Admin/Config/CompanyController.php | 4 - .../Admin/Config/DeliveryController.php | 21 ++-- .../Controllers/Admin/Config/PgController.php | 37 +++---- .../Admin/Config/SmsController.php | 18 ++-- .../Admin/Config/TemplateController.php | 47 +++------ .../Controllers/Admin/Dev/EventController.php | 6 +- .../Controllers/Admin/Dev/MailController.php | 4 +- .../Controllers/Admin/OrderController.php | 6 +- src/Http/Controllers/CartController.php | 2 +- src/Http/Controllers/MainController.php | 2 +- src/Http/Controllers/MarketController.php | 10 +- .../Controllers/Mypage/AddressController.php | 2 +- .../Mypage/CancelReturnExchangeController.php | 22 ++--- .../Controllers/Mypage/CouponController.php | 2 +- .../Controllers/Mypage/FavoriteController.php | 4 +- .../Controllers/Mypage/OrderController.php | 4 +- src/Http/Controllers/Mypage/QnaController.php | 2 +- .../Controllers/Mypage/ReviewController.php | 2 +- .../Controllers/Mypage/UserController.php | 4 +- src/Http/Controllers/OrderController.php | 6 +- src/Http/Controllers/PagesController.php | 2 +- src/Http/Controllers/Payment/LgController.php | 4 +- src/Http/Controllers/SearchController.php | 2 +- .../OrderShippedNotification.php | 2 +- src/Services/DeliveryFee.php | 4 +- src/View/Components/MarketCategory.php | 2 +- src/View/Components/MarketNavyCategory.php | 2 +- src/config/pondol-market.php | 99 ------------------- .../2024_12_06_000001_update_mall_config.php | 5 +- .../2024_12_27_000001_update_mall_config2.php | 99 +++++++++++++++++++ src/helpers.php | 11 ++- src/resources/lang/en/market.php | 31 ++++-- src/resources/lang/ko/market.php | 30 ++++-- .../default-market/auth-confirm.blade.php | 2 +- .../cancel-account-success.blade.php | 4 +- .../default-market/cancel-account.blade.php | 4 +- .../auth/default-market/edit.blade.php | 2 +- .../default-market/forgot-password.blade.php | 2 +- .../auth/default-market/login.blade.php | 2 +- .../default-market/password-reset.blade.php | 2 +- .../register-agreement.blade.php | 2 +- .../default-market/register-success.blade.php | 2 +- .../auth/default-market/register.blade.php | 2 +- .../default-market/reset-password.blade.php | 2 +- .../default-market/verify-email.blade.php | 2 +- .../cancel-return-exchange/index.blade.php | 9 +- .../views/admin/config/bank.blade.php | 2 +- .../views/admin/config/delivery.blade.php | 33 ++----- src/resources/views/admin/config/pg.blade.php | 16 +-- .../views/admin/config/template.blade.php | 21 ++-- .../views/admin/coupon/issue.blade.php | 1 - .../views/admin/order/index.blade.php | 7 +- .../views/components/app-admin.blade.php | 2 + .../partials/navigation-admin.blade.php | 6 +- .../templates/cart/default/cart.blade.php | 2 +- .../layouts/default-lnb/front.blade.php | 6 +- .../layouts/default/front-footer.blade.php | 28 ++---- .../layouts/default/front-header.blade.php | 2 +- .../templates/layouts/default/front.blade.php | 4 +- .../templates/main/default/index.blade.php | 2 +- .../templates/order/default/order.blade.php | 14 +-- .../pages/default/privacy-policy.blade.php | 2 +- .../pages/default/terms-of-use.blade.php | 2 +- .../templates/search/default/search.blade.php | 2 +- .../templates/shop/default/category.blade.php | 2 +- .../templates/shop/default/view.blade.php | 6 +- .../userpage/default/address/index.blade.php | 6 +- .../cancel-return-exchange/create.blade.php | 4 +- .../cancel-return-exchange/index.blade.php | 4 +- .../cancel-return-exchange/refund.blade.php | 6 +- .../cancel-return-exchange/view.blade.php | 4 +- .../userpage/default/coupons.blade.php | 4 +- .../userpage/default/favorite.blade.php | 4 +- .../userpage/default/order/orders.blade.php | 4 +- .../userpage/default/order/view.blade.php | 4 +- .../templates/userpage/default/qnas.blade.php | 4 +- .../userpage/default/review/index.blade.php | 4 +- .../templates/userpage/default/user.blade.php | 4 +- .../views/payment/pg/kcp/pay-form.blade.php | 4 +- .../views/payment/pg/lg/pay-form.blade.php | 4 +- 84 files changed, 376 insertions(+), 414 deletions(-) create mode 100644 src/database/migrations/2024_12_27_000001_update_mall_config2.php diff --git a/README.md b/README.md index ed8fa4c..6b66a64 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ php artisan pondol:create-auth ### 관리자 페이지 접근 ``` -https://yourdomain/adm +https://yourdomain/admin ``` ### 기타 설정 diff --git a/src/Console/InstallsBladeStack.php b/src/Console/InstallsBladeStack.php index 27512ee..aa9277b 100644 --- a/src/Console/InstallsBladeStack.php +++ b/src/Console/InstallsBladeStack.php @@ -84,8 +84,8 @@ protected function installBladeStack($type) \Artisan::call('migrate'); - // 연관 패키지의 config 변경 - $this->chageOtherConfig(); + // 연관 패키지의 config 변경 (수동으로 변경하기) + // $this->chageOtherConfig(); $this->comment('Please execute the "npm install" && "npm run dev" commands to build your assets.'); } diff --git a/src/Http/Controllers/Admin/CancelReturnExchangeController.php b/src/Http/Controllers/Admin/CancelReturnExchangeController.php index 8bdd8d0..dbc327c 100644 --- a/src/Http/Controllers/Admin/CancelReturnExchangeController.php +++ b/src/Http/Controllers/Admin/CancelReturnExchangeController.php @@ -62,8 +62,8 @@ public function index(Request $request) { return view('market::admin.cancel-return-exchange.index', [ 'items'=>$items, - 'return_status' => config('pondol-market.return_status'), - 'exchange_status' => config('pondol-market.exchange_status') + 'refund_status' => __('market::market.refund_status'), + 'exchange_status' => __('market::market.exchange_status') ]); } @@ -90,17 +90,16 @@ public function view($id, Request $request) { $item->displayOptions = extractOptions($item); - + // echo $item->type; switch($item->type) { - case 'return': - $configs = config('pondol-market.return_status'); + case 'refund': + $configs = __('market::market.refund_status'); break; case 'exchange': - $configs = config('pondol-market.exchange_status'); + $configs = __('market::market.exchange_status'); break; } - return view('market::admin.cancel-return-exchange.view', [ 'item'=>$item, 'configs' => $configs, diff --git a/src/Http/Controllers/Admin/Config/BankController.php b/src/Http/Controllers/Admin/Config/BankController.php index 4a3acee..38763b8 100644 --- a/src/Http/Controllers/Admin/Config/BankController.php +++ b/src/Http/Controllers/Admin/Config/BankController.php @@ -2,11 +2,15 @@ namespace Pondol\Market\Http\Controllers\Admin\Config; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; -use DB; use Illuminate\Support\Facades\Log; + +use DB; + +use Pondol\Common\Facades\JsonKeyValue; use Pondol\Market\Models\MarketBank; +use App\Http\Controllers\Controller; + class BankController extends Controller { /** @@ -26,11 +30,9 @@ public function __construct( */ public function index() { - // config()->set('app.name','My Project App'); - // $cat1 = $this->subCategory(''); $banks = MarketBank::where('type', 'manager')->paginate(20)->appends(request()->query()); - $codes = config('pondol-market.banks'); + $codes = JsonKeyValue::getAsArray('banks'); return view('market::admin.config.bank', [ 'banks'=>$banks, 'codes' => $codes @@ -39,9 +41,7 @@ public function index() public function create() { - - // [TACKBAE_MONEY] => 1000 - $codes = config('pondol-market.banks'); + $codes = JsonKeyValue::getAsArray('banks'); return view('market::admin.config.bank-create', [ 'codes' => $codes ]); diff --git a/src/Http/Controllers/Admin/Config/CompanyController.php b/src/Http/Controllers/Admin/Config/CompanyController.php index f92a2bc..5616845 100644 --- a/src/Http/Controllers/Admin/Config/CompanyController.php +++ b/src/Http/Controllers/Admin/Config/CompanyController.php @@ -28,12 +28,9 @@ public function __construct( */ public function index() { - - $company = JsonKeyValue::getAsJson('company'); $company->copyright = isset($company->copyright) ? $company->copyright: ''; - return view('market::admin.config.company', compact('company')); } @@ -50,7 +47,6 @@ public function update(Request $request) { 'copyright' => $request->copyright, ]; - set_config('pondol-market.company', $params ); JsonKeyValue::storeAsJson('company', $params); return response()->json(['error'=>false]); } diff --git a/src/Http/Controllers/Admin/Config/DeliveryController.php b/src/Http/Controllers/Admin/Config/DeliveryController.php index d26f907..7348ad5 100644 --- a/src/Http/Controllers/Admin/Config/DeliveryController.php +++ b/src/Http/Controllers/Admin/Config/DeliveryController.php @@ -2,10 +2,13 @@ namespace Pondol\Market\Http\Controllers\Admin\Config; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; -use DB; use Illuminate\Support\Facades\Log; +use DB; + +use Pondol\Common\Facades\JsonKeyValue; + +use App\Http\Controllers\Controller; class DeliveryController extends Controller { @@ -26,13 +29,8 @@ public function __construct( */ public function index() { - // config()->set('app.name','My Project App'); - // $cat1 = $this->subCategory(''); - // \Artisan::call('config:clear'); // 만약 production mode이고 config를 cache 하여 사용하면 - $cfg = config('pondol-market'); - return view('market::admin.config.delivery', [ - 'cfg'=>$cfg + 'delivery'=>JsonKeyValue::getAsJson('market.delivery') ]); } @@ -42,12 +40,7 @@ public function update(Request $request) { 'type' => $request->type, 'min' => $request->min ]; - // [TACKBAE_MONEY] => 1000 - set_config('pondol-market.delivery', $config ); - + JsonKeyValue::update('market.delivery', $config); } - - - } diff --git a/src/Http/Controllers/Admin/Config/PgController.php b/src/Http/Controllers/Admin/Config/PgController.php index 8d57668..1918b95 100644 --- a/src/Http/Controllers/Admin/Config/PgController.php +++ b/src/Http/Controllers/Admin/Config/PgController.php @@ -2,11 +2,13 @@ namespace Pondol\Market\Http\Controllers\Admin\Config; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; -use DB; use Illuminate\Support\Facades\Log; -use Pondol\Market\Models\MarketBank; +use DB; + +use Pondol\Common\Facades\JsonKeyValue; + +use App\Http\Controllers\Controller; class PgController extends Controller { /** @@ -26,18 +28,12 @@ public function __construct( */ public function index() { - // config()->set('app.name','My Project App'); - // $cat1 = $this->subCategory(''); - - // $banks = MarketBank::paginate(20)->appends(request()->query()); - $payment = config('pondol-market.payment'); + $payment = JsonKeyValue::getAsJson('payment'); $pgs = ['inicis'=>'Inicis', 'kcp'=>'KCP', 'lg'=>'LG']; $simples = ['naver'=>'네이버 페이', 'kakao'=>'카카오 페이']; // simplePayments - return view('market::admin.config.pg', [ - 'payment' => $payment, - 'pgs'=>$pgs, - 'simples' => $simples - ]); + return view('market::admin.config.pg', compact( + 'payment', 'pgs', 'simples' + )); } @@ -51,19 +47,8 @@ public function update(Request $request) { 'naver' => $request->naver ? true : false, 'kakao' => $request->kakao ? true : false, ]; - Log::info($params); - set_config('pondol-market.payment', $params ); + + JsonKeyValue::update('payment', $params); return response()->json(['error'=>false]); } - - // public function destroy(MarketBank $bank, Request $request) { - // $bank->delete(); - // return response()->json([ - // 'error' => false - // ]); - // // return redirect()->route('market.admin.config.banks'); - // } - - - } diff --git a/src/Http/Controllers/Admin/Config/SmsController.php b/src/Http/Controllers/Admin/Config/SmsController.php index b5ed7a2..ebdb601 100644 --- a/src/Http/Controllers/Admin/Config/SmsController.php +++ b/src/Http/Controllers/Admin/Config/SmsController.php @@ -2,10 +2,13 @@ namespace Pondol\Market\Http\Controllers\Admin\Config; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; -use DB; use Illuminate\Support\Facades\Log; -use Pondol\Market\Models\MarketBank; + +use DB; + +use Pondol\Common\Facades\JsonKeyValue; + +use App\Http\Controllers\Controller; class SmsController extends Controller { @@ -27,11 +30,10 @@ public function __construct( public function index() { - $sms = config('pondol-market.sms'); + $sms = JsonKeyValue::getAsArray('sms'); $vendors = ['smsto'=>'SMS.TO', 'directsend'=>'DIRECTSEND']; - $sms = isset($sms) ? $sms : []; - + $sms = array_merge(['vendor'=>null, 'key'=>null, 'id'=>null, 'sender'=>null, 'manager_rec_order'=>false], $sms); return view('market::admin.config.sms', [ @@ -48,8 +50,8 @@ public function update(Request $request) { 'sender' => $request->sender, 'manager_rec_order' => $request->manager_rec_order ? true : false ]; - Log::info($params); - set_config('pondol-market.sms', $params ); + + JsonKeyValue::update('market.delivery', $params); return response()->json(['error'=>false]); } diff --git a/src/Http/Controllers/Admin/Config/TemplateController.php b/src/Http/Controllers/Admin/Config/TemplateController.php index a39a29d..2e0cebb 100644 --- a/src/Http/Controllers/Admin/Config/TemplateController.php +++ b/src/Http/Controllers/Admin/Config/TemplateController.php @@ -9,7 +9,7 @@ use Storage; use App\Http\Controllers\Controller; - +use Pondol\Common\Facades\JsonKeyValue; class TemplateController extends Controller { @@ -75,28 +75,14 @@ public function view() $pages_dir = resource_path('views/market/templates/pages'); $pages = array_map('basename',\File::directories($pages_dir)); - $template = config('pondol-market.template'); - - return view('market::admin.config.template', [ - 'template'=>$template, - 'layouts'=>$layouts, - 'main'=>$main, - 'shop'=>$shop, - 'cart'=>$cart, - 'order'=>$order, - 'userpage'=>$userpage, - 'search'=>$search, - // 'auth'=>$auth, - 'components'=>$components, - 'mail'=>$mail, - 'pages'=>$pages, - ]); + $template = JsonKeyValue::getAsArray('market.template'); + return view('market::admin.config.template', compact( + 'template','layouts','main','shop','cart','order','userpage','search','components','mail','pages' + )); } public function update(Request $request) { - $template = config('pondol-market.template'); - - $template['layout']['theme'] = $request->layout; + $template['layouts']['theme'] = $request->layouts; $template['main']['theme'] = $request->main; $template['shop']['theme'] = $request->shop; $template['shop']['theme'] = $request->shop; @@ -107,11 +93,11 @@ public function update(Request $request) { $template['search']['theme'] = $request->search; $template['search']['lists'] = $request->search_lists; $template['auth']['theme'] = $request->auth; - $template['component']['theme'] = $request->component; + $template['components']['theme'] = $request->components; $template['mail']['theme'] = $request->mail; $template['pages']['theme'] = $request->pages; - set_config('pondol-market.template', $template ); + JsonKeyValue::update('market.template', $template); return response()->json(['error'=>false]); } @@ -119,16 +105,10 @@ public function updateCI(Request $request) { $file = $request->file('file'); if($file) { - // $filepath = storage_path('app/public/market'); $filepath = 'public/market'; - // $filepath = public_path('storage/market'); $fileName = $file->getClientOriginalName(); - // $ext = $file->getClientOriginalExtension(); - // $fileName = $name.'.'.$ext; - // $path=\Storage::put($filepath, $file); // - $result = $file->storeAs($filepath, $fileName); - set_config('pondol-market.template.ci', $fileName ); + JsonKeyValue::update('market.template', ['ci'=>$fileName]); } return redirect()->back(); @@ -137,17 +117,12 @@ public function updateCI(Request $request) { public function updateFavicon(Request $request) { $file = $request->file('file'); if($file) { - // $filepath = storage_path('market'); $filepath = 'public/market'; $fileName = $file->getClientOriginalName(); - // $ext = $file->getClientOriginalExtension(); - // $fileName = $name.'.'.$ext; - // $path=\Storage::put($filepath, $file); // - $result = $file->storeAs($filepath, $fileName); - set_config('pondol-market.template.favicon', $fileName ); + JsonKeyValue::update('market.template', ['favicon'=>$fileName]); } - // return redirect()->back(); + return redirect()->back(); } } diff --git a/src/Http/Controllers/Admin/Dev/EventController.php b/src/Http/Controllers/Admin/Dev/EventController.php index 90cd3b1..137ab72 100644 --- a/src/Http/Controllers/Admin/Dev/EventController.php +++ b/src/Http/Controllers/Admin/Dev/EventController.php @@ -70,7 +70,7 @@ public function preview(Request $request) switch($request->type) { case 'notice': - return view('market.templates.mail.'.config('pondol-market.template.mail.theme').'.'.$request->type, ['mailData'=>$mailData]); + return view(market_theme('mail').'.'.$request->type, ['mailData'=>$mailData]); break; case 'order': @@ -83,11 +83,11 @@ public function preview(Request $request) $item->displayOptions = extractOptions($item); } - return view('market.templates.mail.'.config('pondol-market.template.mail.theme').'.'.$request->type, ['mailData'=>$mailData]); + return view(market_theme('mail').'.'.$request->type, ['mailData'=>$mailData]); break; case 'register': - return view('market.templates.mail.'.config('pondol-market.template.mail.theme').'.'.$request->type, ['mailData'=>$mailData]); + return view(market_theme('mail').'.'.$request->type, ['mailData'=>$mailData]); break; } diff --git a/src/Http/Controllers/Admin/Dev/MailController.php b/src/Http/Controllers/Admin/Dev/MailController.php index 7451492..b7f16b1 100644 --- a/src/Http/Controllers/Admin/Dev/MailController.php +++ b/src/Http/Controllers/Admin/Dev/MailController.php @@ -79,7 +79,7 @@ public function preview(Request $request) $user = User::select('id', 'email', 'name')->find($request->to); $mailData->user = $user; - return view('market.templates.mail.'.config('pondol-market.template.mail.theme').'.'.$request->type, ['mailData'=>$mailData]); + return view(market_theme('mail').'.'.$request->type, ['mailData'=>$mailData]); break; case 'order': @@ -92,7 +92,7 @@ public function preview(Request $request) $item->displayOptions = extractOptions($item); } - return view('market.templates.mail.'.config('pondol-market.template.mail.theme').'.'.$request->type, ['user'=>$user, 'data'=>$mailData]); + return view(market_theme('mail').'.'.$request->type, ['user'=>$user, 'data'=>$mailData]); break; case 'register': $user = User::select('id', 'email', 'name')->find($request->to); diff --git a/src/Http/Controllers/Admin/OrderController.php b/src/Http/Controllers/Admin/OrderController.php index ddac106..a93a2de 100644 --- a/src/Http/Controllers/Admin/OrderController.php +++ b/src/Http/Controllers/Admin/OrderController.php @@ -105,9 +105,9 @@ public function view($o_id) { $couriers = $this->_couriers(); - $delivery_status = config('pondol-market.delivery_status'); - $pay_status = config('pondol-market.pay_status'); - + $delivery_status = __('market::market.delivery_status'); + $pay_status = __('market::market.pay_status'); + return view('market::admin.order.view', [ 'items'=>$items, diff --git a/src/Http/Controllers/CartController.php b/src/Http/Controllers/CartController.php index 7092f9c..d7996d8 100644 --- a/src/Http/Controllers/CartController.php +++ b/src/Http/Controllers/CartController.php @@ -60,7 +60,7 @@ public function index(Request $request) // 옵션을 분리하여 처리한다. - return view('market.templates.cart.'.config('pondol-market.template.cart.theme').'.cart', compact('items', 'meta')); + return view(market_theme('cart').'.cart', compact('items', 'meta')); } public function store(Request $request) diff --git a/src/Http/Controllers/MainController.php b/src/Http/Controllers/MainController.php index 6add9b0..87beb9b 100644 --- a/src/Http/Controllers/MainController.php +++ b/src/Http/Controllers/MainController.php @@ -48,7 +48,7 @@ public function index(Request $request) $main[$v->display][] = $v; } - return view('market.templates.main.'.config('pondol-market.template.main.theme').'.index', [ + return view(market_theme('main').'.index', [ 'main' => $main ]); } diff --git a/src/Http/Controllers/MarketController.php b/src/Http/Controllers/MarketController.php index c857ab3..dc9f623 100644 --- a/src/Http/Controllers/MarketController.php +++ b/src/Http/Controllers/MarketController.php @@ -39,9 +39,8 @@ public function category($category, Request $request) $items = $this->categoryItems($request, $category) ->orderBy('market_items.id', 'desc') - ->paginate(config('pondol-market.template.shop.lists'))->withQueryString(); + ->paginate(jsonval('market.template', 'shop.lists'))->withQueryString(); - // 현재 카테고리를 저장해 둔다. $request->session()->put('category', $category); @@ -70,7 +69,7 @@ public function category($category, Request $request) // $this->meta->keywords = implode(',', $keywords); - return view('market.templates.shop.'.config('pondol-market.template.shop.theme').'.category', + return view(market_theme('shop').'.category', compact('category', 'items', 'categoryObj', 'meta')); } @@ -123,12 +122,9 @@ public function view(MarketItem $item, Request $request) } } - // $this->meta->setItem($item); $meta = Meta::get(); - // $meta->title(''); - // return; - return view('market.templates.shop.'.config('pondol-market.template.shop.theme').'.view', [ + return view(market_theme('shop').'.view', [ 'meta' => $meta, 'item' => $item, 'images' => $images, diff --git a/src/Http/Controllers/Mypage/AddressController.php b/src/Http/Controllers/Mypage/AddressController.php index 398c8f6..fa0bd42 100644 --- a/src/Http/Controllers/Mypage/AddressController.php +++ b/src/Http/Controllers/Mypage/AddressController.php @@ -47,7 +47,7 @@ public function index(Request $request) // $items = $this->orderSvc->orderList($user->id)->orderBy('market_orders.id', 'desc')->paginate(15)->withQueryString(); // default를 먼저 가져오고 최근 사용한 순으로 가져온다. $addresses = MarketAddress::where('user_id', $user->id)->orderBy('default', 'desc')->orderBy('updated_at', 'desc')->get(); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.address.index', [ + return view(market_theme('userpage').'.address.index', [ 'addresses' => $addresses, ]); } diff --git a/src/Http/Controllers/Mypage/CancelReturnExchangeController.php b/src/Http/Controllers/Mypage/CancelReturnExchangeController.php index b0ceb78..b1b0dd2 100644 --- a/src/Http/Controllers/Mypage/CancelReturnExchangeController.php +++ b/src/Http/Controllers/Mypage/CancelReturnExchangeController.php @@ -50,8 +50,8 @@ public function index(Request $request) { ->where("re.user_id", $user->id) ->orderBy('re.id', 'desc')->paginate(15)->withQueryString(); - $refund_status = config('pondol-market.refund_status'); - $exchange_status = config('pondol-market.exchange_status'); + $refund_status = __('market::market.refund_status'); + $exchange_status = __('market::market.exchange_status'); foreach($items as $item) { $item->displayOptions = extractOptions($item); switch($item->type) { @@ -64,10 +64,10 @@ public function index(Request $request) { } } - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.cancel-return-exchange.index', [ + return view(market_theme('userpage').'.cancel-return-exchange.index', [ 'items'=>$items, - 'refund_status' => config('pondol-market.refund_status'), - 'exchange_status' => config('pondol-market.exchange_status') + 'refund_status' => __('market::market.refund_status'), + 'exchange_status' => __('market::market.exchange_status') ]); } /** @@ -110,7 +110,7 @@ public function create($type, $o_id, Request $request) break; } - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.cancel-return-exchange.create', [ + return view(market_theme('userpage').'.cancel-return-exchange.create', [ 'type'=>$type, 'o_id'=>$o_id, 'items' => $items, @@ -204,15 +204,15 @@ public function view($id, Request $request) { switch($item->type) { case 'refund': - $configs = config('pondol-market.refund_status'); + $configs = __('market::market.refund_status'); break; case 'exchange': - $configs = config('pondol-market.exchange_status'); + $configs = __('market::market.exchange_status'); break; } - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.cancel-return-exchange.view', [ + return view(market_theme('userpage').'.cancel-return-exchange.view', [ 'item'=>$item, 'configs' => $configs, ]); @@ -230,8 +230,8 @@ public function refund(Request $request) { $bank->no = null; $bank->owner = null; } - $codes = config('pondol-market.banks'); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.cancel-return-exchange.refund', [ + $codes = JsonKeyValue::getAsArray('banks'); + return view(market_theme('userpage').'.cancel-return-exchange.refund', [ 'bank'=>$bank, 'codes' => $codes ]); diff --git a/src/Http/Controllers/Mypage/CouponController.php b/src/Http/Controllers/Mypage/CouponController.php index e7b0776..c88ef8e 100644 --- a/src/Http/Controllers/Mypage/CouponController.php +++ b/src/Http/Controllers/Mypage/CouponController.php @@ -53,7 +53,7 @@ public function index(Request $request) } // print_r($items); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.coupons', [ + return view(market_theme('userpage').'.coupons', [ 'items' => $items, ]); } diff --git a/src/Http/Controllers/Mypage/FavoriteController.php b/src/Http/Controllers/Mypage/FavoriteController.php index 00e50ab..5ad76a7 100644 --- a/src/Http/Controllers/Mypage/FavoriteController.php +++ b/src/Http/Controllers/Mypage/FavoriteController.php @@ -34,7 +34,7 @@ public function index(Request $request) // 현재 선택한 상품을 리스트업 한다. $items = $items->orderBy('market_item_favorites.id', 'desc')->paginate(15)->withQueryString(); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.favorite', [ + return view(market_theme('userpage').'.favorite', [ 'items' => $items, ]); @@ -49,7 +49,7 @@ public function index(Request $request) // // exit; - // return view('market.templates.'.config('pondol-market.template.userpage.theme').'.mypage.order-view', [ + // return view(market_theme('userpage').'.mypage.order-view', [ // 'user' => $user, // 'items' => $items, // 'display' =>$display, diff --git a/src/Http/Controllers/Mypage/OrderController.php b/src/Http/Controllers/Mypage/OrderController.php index 070b03d..1b98328 100644 --- a/src/Http/Controllers/Mypage/OrderController.php +++ b/src/Http/Controllers/Mypage/OrderController.php @@ -52,7 +52,7 @@ public function index(Request $request) // 현재 선택한 상품을 리스트업 한다. $items = $this->orderSvc->orderList($user->id)->orderBy('market_orders.id', 'desc')->paginate(15)->withQueryString(); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.order.orders', [ + return view(market_theme('userpage').'.order.orders', [ 'user' => $user, 'items' => $items, ]); @@ -71,7 +71,7 @@ public function view($o_id, Request $request) { } - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.order.view', [ + return view(market_theme('userpage').'.order.view', [ 'user' => $user, 'items' => $items, 'display' =>$display, diff --git a/src/Http/Controllers/Mypage/QnaController.php b/src/Http/Controllers/Mypage/QnaController.php index 9da943c..e0a974f 100644 --- a/src/Http/Controllers/Mypage/QnaController.php +++ b/src/Http/Controllers/Mypage/QnaController.php @@ -45,7 +45,7 @@ public function index(Request $request) // 현재 선택한 상품을 리스트업 한다. // $items = $this->orderSvc->orderList($user->id)->orderBy('market_orders.id', 'desc')->paginate(15)->withQueryString(); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.qnas', [ + return view(market_theme('userpage').'.qnas', [ 'user' => $user, 'items' => $items, ]); diff --git a/src/Http/Controllers/Mypage/ReviewController.php b/src/Http/Controllers/Mypage/ReviewController.php index 8b8441b..b06c74b 100644 --- a/src/Http/Controllers/Mypage/ReviewController.php +++ b/src/Http/Controllers/Mypage/ReviewController.php @@ -53,7 +53,7 @@ public function index(Request $request) }) ->orderBy('market_buyers.id', 'desc')->paginate(15)->withQueryString(); - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.review.index', [ + return view(market_theme('userpage').'.review.index', [ 'user' => $user, 'items' => $items, ]); diff --git a/src/Http/Controllers/Mypage/UserController.php b/src/Http/Controllers/Mypage/UserController.php index 755e6b9..3a6619a 100644 --- a/src/Http/Controllers/Mypage/UserController.php +++ b/src/Http/Controllers/Mypage/UserController.php @@ -46,14 +46,14 @@ public function index(Request $request) // 현재 선택한 상품을 리스트업 한다. // $items = $this->orderSvc->orderList($user->id)->orderBy('market_orders.id', 'desc')->paginate(15)->withQueryString(); // default를 먼저 가져오고 최근 사용한 순으로 가져온다. - return view('market.templates.userpage.'.config('pondol-market.template.userpage.theme').'.user', [ + return view(market_theme('userpage').'.user', [ 'user' => $user ]); } public function edit(Request $request) { $user = $request->user(); - return view('market.templates.'.config('pondol-market.template.theme').'.auth.edit', [ + return view(market_theme('template').'.auth.edit', [ 'user' => $user, ]); } diff --git a/src/Http/Controllers/OrderController.php b/src/Http/Controllers/OrderController.php index 68ca1bb..e2b02d8 100644 --- a/src/Http/Controllers/OrderController.php +++ b/src/Http/Controllers/OrderController.php @@ -22,6 +22,8 @@ use Pondol\Market\Events\OrderShipped; use Pondol\Auth\Traits\Point; +use Pondol\Common\Facades\JsonKeyValue; + use App\Http\Controllers\Controller; class OrderController extends Controller @@ -130,7 +132,7 @@ public function index(Request $request) $buyer->tel1_3 = isset($tel1[2]) ? $tel1[2] : ''; // 무통장 계좌 가져오기] - $codes = config('pondol-market.banks'); + $codes = JsonKeyValue::getAsArray('banks'); $banks = MarketBank::get(); foreach($banks as $v) { $v->name = $codes[$v->code]['name']; @@ -198,7 +200,7 @@ public function index(Request $request) - return view('market.templates.order.'.config('pondol-market.template.order.theme').'.order', + return view(market_theme('order').'.order', compact('user','items','buyer','display','banks','addresses','coupons')); } diff --git a/src/Http/Controllers/PagesController.php b/src/Http/Controllers/PagesController.php index 7b60023..ae3ed08 100644 --- a/src/Http/Controllers/PagesController.php +++ b/src/Http/Controllers/PagesController.php @@ -43,7 +43,7 @@ public function show(Request $request, $page) break; } - return view('market.templates.pages.'.config('pondol-market.template.pages.theme').'.'.$page, [ + return view(market_theme('pages').'.'.$page, [ 'meta' => $this->meta, 'item' => $item, ]); diff --git a/src/Http/Controllers/Payment/LgController.php b/src/Http/Controllers/Payment/LgController.php index ae8ede1..f883f04 100644 --- a/src/Http/Controllers/Payment/LgController.php +++ b/src/Http/Controllers/Payment/LgController.php @@ -77,8 +77,8 @@ public function hashdata(Request $request) { $xpay = new XPay($configPath, $CST_PLATFORM); // Mert Key 설정 - $xpay->set_config_value('t'.$LGD_MID, config('pondol-market.payment.mid')); - $xpay->set_config_value($LGD_MID, config('pondol-market.payment.mid')); + $xpay->set_config_value('t'.$LGD_MID, jsonval('payment', 'mid')); + $xpay->set_config_value($LGD_MID, jsonval('payment', 'mid')); $xpay->Init_TX($LGD_MID); $LGD_HASHDATA = md5($LGD_MID.$LGD_OID.$LGD_AMOUNT.$LGD_TIMESTAMP.$xpay->config[$LGD_MID]); diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php index 494ab1f..7a6bee2 100644 --- a/src/Http/Controllers/SearchController.php +++ b/src/Http/Controllers/SearchController.php @@ -41,7 +41,7 @@ public function index(Request $request) { ->description($request->q.'에 대한 검색결과'); // print_r(DB::getQueryLog()); - return view('market.templates.search.'.config('pondol-market.template.search.theme').'.search', + return view(market_theme('search').'.search', compact('items', 'meta', 'categories')); } diff --git a/src/Notifications/OrderShippedNotification.php b/src/Notifications/OrderShippedNotification.php index c88d04b..e3006c7 100644 --- a/src/Notifications/OrderShippedNotification.php +++ b/src/Notifications/OrderShippedNotification.php @@ -53,7 +53,7 @@ public function toMail($notifiable) return (new MailMessage) ->subject($notifiable->name.'님의 주문정보입니다.') - ->markdown('market.templates.mail.'.config('pondol-market.template.mail.theme').'.order', [ + ->markdown(market_theme('mail').'.order', [ 'user' => $notifiable, 'data' => $this->data ]); diff --git a/src/Services/DeliveryFee.php b/src/Services/DeliveryFee.php index 0a116db..1d4dce0 100644 --- a/src/Services/DeliveryFee.php +++ b/src/Services/DeliveryFee.php @@ -5,7 +5,7 @@ class DeliveryFee { public function cal($total) { - $delivery = config('pondol-market.delivery'); + $delivery = jsonval('market.delivery'); $delivery_fee = 0; @@ -18,7 +18,7 @@ public function cal($total) { } public function view() { - $delivery = config('pondol-market.delivery'); + $delivery = jsonval('market.delivery'); switch($delivery["type"]) { case 'none': return '무료'; diff --git a/src/View/Components/MarketCategory.php b/src/View/Components/MarketCategory.php index 00f91da..32cc982 100644 --- a/src/View/Components/MarketCategory.php +++ b/src/View/Components/MarketCategory.php @@ -21,7 +21,7 @@ public function render() { $category = CategoryModel::whereRaw('LENGTH(category) = 3')->orderBy('order', 'asc')->get(); - return view('market.templates.components.'.config('pondol-market.template.component.theme').'.category', compact('category')); + return view(market_theme('components').'.category', compact('category')); } diff --git a/src/View/Components/MarketNavyCategory.php b/src/View/Components/MarketNavyCategory.php index fa629ff..468d287 100644 --- a/src/View/Components/MarketNavyCategory.php +++ b/src/View/Components/MarketNavyCategory.php @@ -23,7 +23,7 @@ public function render() return null; } - return view('market.templates.components.'.config('pondol-market.template.component.theme').'.navycategory', [ + return view(market_theme('components').'.navycategory', [ 'categoryObj'=>$this->categoryObj ]); } diff --git a/src/config/pondol-market.php b/src/config/pondol-market.php index 90e69f8..20cb57c 100644 --- a/src/config/pondol-market.php +++ b/src/config/pondol-market.php @@ -13,103 +13,4 @@ 'as' => 'market.admin.', 'middleware' => ['web', 'admin'] ], - - 'delivery' => [ - 'fee' => 0, - 'type' => 'none', - 'min' => 0 - ], - 'delivery_status' => [ - 0 => '주문', - 10 => '결제완료',// 상품준비 - // 20 => '상품준비', - 30 => '배송중', - 40 => '배송완료', - 50 => '주문취소요청', - 59 => '주문취소완료', - 100 => '거래완료', - ], - 'exchange_status' => [ // 30, 60, 80 일경우 모든 주문이 완료 - 0 => '접수신청', // 결제대기 - 10 => '거절',// 상품준비 - 20 => '교환진행중', - 90 => '교환완료' - ], - 'refund_status' => [ // 30, 60, 80 일경우 모든 주문이 완료 - 0 => '접수신청', // 결제대기 - 10 => '거절',// 상품준비 - 20 => '반품진행중', - 90 => '반품완료' - ], - 'pay_status' => [ - '0'=>'지불대기', - '10'=>'지불완료', - '20'=>'결제취소' - ], - 'payment' => [ - 'pg' => 'kcp', - 'mid' => 'T0000', - 'sitekey' => '3grptw1.zW0GSo4PQdaGvsF__', - 'submit_url' => 'https://testpay.kcp.co.kr/plugin/payplus_web.jsp', - 'service'=>false, - 'naver'=>false, - 'kakao'=>false - ], - 'template' => [ - 'layout' => ['theme'=>'default'], - 'main' => ['theme'=>'default'], - 'shop' => ['theme'=>'default', 'lists'=> 20], - 'cart' => ['theme'=>'default'], - 'order' => ['theme'=>'default'], - 'userpage' => ['theme'=>'default'], - 'search' => ['theme'=>'default', 'lists'=> 20], - 'auth' => ['theme'=>'default'], - 'component' => ['theme'=>'default'], - 'mail' => ['theme'=>'default'], - 'pages' => ['theme'=>'default'], - 'ci' => 'logo.png', - 'favicon' => 'favicon.ico', - ], - 'banks' => [ - '039'=>['name'=>'경남은행', 'siwft'=>'KYNAKR22XXX'], - '034'=>['name'=>'광주은행', 'siwft'=>'KWABKRSE'], - '004'=>['name'=>'국민은행', 'siwft'=>'CZNBKRSE'], - '003'=>['name'=>'기업은행', 'siwft'=>'IBKOKRSE'], - '011'=>['name'=>'농협은행', 'siwft'=>'NACFKRSEXXX'], - '031'=>['name'=>'대구은행', 'siwft'=>'DAEBKR22'], - '032'=>['name'=>'부산은행', 'siwft'=>'PUSBKR2P'], - '002'=>['name'=>'산업은행', 'siwft'=>'KODBKRSE'], - '050'=>['name'=>'상호저축은행', 'siwft'=>''], - '045'=>['name'=>'새마을금고', 'siwft'=>''], - '007'=>['name'=>'수협은행', 'siwft'=>'NFFCKRSE'], - '027'=>['name'=>'씨티은행', 'siwft'=>'CITIKRSX'], - '088'=>['name'=>'신한은행', 'siwft'=>'SHBKKRSE'], - '048'=>['name'=>'신협은행', 'siwft'=>''], - '005'=>['name'=>'외환은행', 'siwft'=>'KEOXKRSE'], - '020'=>['name'=>'우리은행', 'siwft'=>'HVBKKRSEXXX'], - '071'=>['name'=>'우체국은행', 'siwft'=>'SHBKKRSEPO'], - '037'=>['name'=>'전북은행', 'siwft'=>'JEONKRSE'], - '035'=>['name'=>'제주은행', 'siwft'=>'JJBKKR22'], - '090'=>['name'=>'카카오뱅크', 'siwft'=>'CITIKRSXKAK'], - '089'=>['name'=>'케이뱅크', 'siwft'=>''], - '092'=>['name'=>'토스뱅크', 'siwft'=>''], - '081'=>['name'=>'하나은행', 'siwft'=>'HNBNKRSE'], - '023'=>['name'=>'SC제일은행', 'siwft'=>'SCBLKRSE'] - ], - 'sms' => [ - 'vendor' => 'smsto', - 'key' => 'ADFAFAF', - 'id' => 'ASDFADFADF', - 'sender' => 'ADFADFA', - 'manager_rec_order' => true, - ], - 'company' => [ - 'name' => '온스토리몰', - 'businessNumber' => 'xxx-xx-xxxxx', - 'mailOrderSalesRegistrationNumber' => '제xxxx-서울강남-xxxx호', - 'address' => '서울특별시 강남구 멋진빌딩 1F', - 'representative' => '김재벌', - 'tel1' => '02-xxxx-xxxx', - 'fax1' => '02-yyyy-yyyy', - ], ]; \ No newline at end of file diff --git a/src/database/migrations/2024_12_06_000001_update_mall_config.php b/src/database/migrations/2024_12_06_000001_update_mall_config.php index 86140c4..e16ae92 100644 --- a/src/database/migrations/2024_12_06_000001_update_mall_config.php +++ b/src/database/migrations/2024_12_06_000001_update_mall_config.php @@ -14,12 +14,9 @@ class UpdateMallConfig extends Migration public function up() { if (Schema::hasTable('json_key_values')) { - DB::table('json_key_values')->updateOrInsert( ['key' => 'company'],['v' => '{"name":"\uc628\uc2a4\ud1a0\ub9ac\ubab0","businessNumber":"xxx-xx-xxxxx","mailOrderSalesRegistrationNumber":"\uc81cxxxx-\uc11c\uc6b8\uac15\ub0a8-xxxx\ud638","address":"\uc11c\uc6b8\ud2b9\ubcc4\uc2dc \uac15\ub0a8\uad6c \uba4b\uc9c4\ube4c\ub529 1F","representative":"\uae40\uc7ac\ubc8c","tel1":"02-xxxx-xxxx","fax1":"02-yyyy-yyyy"}'] - ); - - + ); } } diff --git a/src/database/migrations/2024_12_27_000001_update_mall_config2.php b/src/database/migrations/2024_12_27_000001_update_mall_config2.php new file mode 100644 index 0000000..8944535 --- /dev/null +++ b/src/database/migrations/2024_12_27_000001_update_mall_config2.php @@ -0,0 +1,99 @@ +updateOrInsert( + ['key' => 'market.template'],['v' => '{"ci":"logo.png","favicon":"favicon.ico","layouts":{"theme":"default"},"main":{"theme":"default"},"shop":{"theme":"default","lists":"20"},"cart":{"theme":"default"},"order":{"theme":"default"},"userpage":{"theme":"default"},"search":{"theme":"default","lists":"20"},"components":{"theme":"default"},"mail":{"theme":"default"},"pages":{"theme":"default"}}'] + ); + + $banks = [ + '039'=>['name'=>'경남은행', 'siwft'=>'KYNAKR22XXX'], + '034'=>['name'=>'광주은행', 'siwft'=>'KWABKRSE'], + '004'=>['name'=>'국민은행', 'siwft'=>'CZNBKRSE'], + '003'=>['name'=>'기업은행', 'siwft'=>'IBKOKRSE'], + '011'=>['name'=>'농협은행', 'siwft'=>'NACFKRSEXXX'], + '031'=>['name'=>'대구은행', 'siwft'=>'DAEBKR22'], + '032'=>['name'=>'부산은행', 'siwft'=>'PUSBKR2P'], + '002'=>['name'=>'산업은행', 'siwft'=>'KODBKRSE'], + '050'=>['name'=>'상호저축은행', 'siwft'=>''], + '045'=>['name'=>'새마을금고', 'siwft'=>''], + '007'=>['name'=>'수협은행', 'siwft'=>'NFFCKRSE'], + '027'=>['name'=>'씨티은행', 'siwft'=>'CITIKRSX'], + '088'=>['name'=>'신한은행', 'siwft'=>'SHBKKRSE'], + '048'=>['name'=>'신협은행', 'siwft'=>''], + '005'=>['name'=>'외환은행', 'siwft'=>'KEOXKRSE'], + '020'=>['name'=>'우리은행', 'siwft'=>'HVBKKRSEXXX'], + '071'=>['name'=>'우체국은행', 'siwft'=>'SHBKKRSEPO'], + '037'=>['name'=>'전북은행', 'siwft'=>'JEONKRSE'], + '035'=>['name'=>'제주은행', 'siwft'=>'JJBKKR22'], + '090'=>['name'=>'카카오뱅크', 'siwft'=>'CITIKRSXKAK'], + '089'=>['name'=>'케이뱅크', 'siwft'=>''], + '092'=>['name'=>'토스뱅크', 'siwft'=>''], + '081'=>['name'=>'하나은행', 'siwft'=>'HNBNKRSE'], + '023'=>['name'=>'SC제일은행', 'siwft'=>'SCBLKRSE'] + ]; + + DB::table('json_key_values')->updateOrInsert( + ['key' => 'banks'],['v' => json_encode($banks)] + ); + } + + + $sms = [ + 'vendor' => 'smsto', + 'key' => 'ADFAFAF', + 'id' => 'ASDFADFADF', + 'sender' => 'ADFADFA', + 'manager_rec_order' => true, + ]; + + DB::table('json_key_values')->updateOrInsert( + ['key' => 'sms'],['v' => json_encode($sms)] + ); + + $payment = [ + 'pg' => 'kcp', + 'mid' => 'T0000', + 'sitekey' => '3grptw1.zW0GSo4PQdaGvsF__', + 'submit_url' => 'https://testpay.kcp.co.kr/plugin/payplus_web.jsp', + 'service'=>false, + 'naver'=>false, + 'kakao'=>false + ]; + + DB::table('json_key_values')->updateOrInsert( + ['key' => 'payment'],['v' => json_encode($payment)] + ); + + $delivery = [ + 'fee' => 0, + 'type' => 'none', + 'min' => 0 + ]; + + DB::table('json_key_values')->updateOrInsert( + ['key' => 'market.delivery'],['v' => json_encode($delivery)] + ); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + } +} diff --git a/src/helpers.php b/src/helpers.php index ff5f38f..ff84464 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -1,4 +1,13 @@ {$theme}->theme; + } +} + if (!function_exists('market_get_thumb')) { function market_get_thumb($file, $width=null, $height=null){ return Pondol\Market\Services\ViewerService::get_thumb($file, $width, $height); @@ -13,7 +22,7 @@ function getImageUrl($url) { if (!function_exists('delivery_fee_show')) { function delivery_fee_show() { - $delivery = config('pondol-market.delivery'); + $delivery = jsonval('market.delivery'); switch($delivery["type"]) { case 'none': return '무료'; diff --git a/src/resources/lang/en/market.php b/src/resources/lang/en/market.php index 8f7f48d..e0da12a 100644 --- a/src/resources/lang/en/market.php +++ b/src/resources/lang/en/market.php @@ -9,19 +9,36 @@ '10'=>'결제완료', '20'=>'결제취소', ], - 'delivery_status' => [ +'delivery_status' => [ '0' => '주문', // 결제대기
쇼핑몰 메인 - @extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') + @extends(market_theme('layouts').'.front') @section('title', '회원탈퇴') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/cancel-account.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/cancel-account.blade.php index e7047c0..27a8459 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/cancel-account.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/cancel-account.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원탈퇴') @section('content')
@@ -10,7 +10,7 @@

{{ Config::get('app.name') }}

회원탈퇴

-
+ @csrf @method('DELETE')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/edit.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/edit.blade.php index 8d85bbc..e1c2fa2 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/edit.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/edit.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('content') diff --git a/src/resources/views/3rdparty-templates/auth/default-market/forgot-password.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/forgot-password.blade.php index 01b275f..01a72ce 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/forgot-password.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/forgot-password.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '로그인') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/login.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/login.blade.php index 7a3f188..7ec4fd5 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/login.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/login.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '로그인') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/password-reset.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/password-reset.blade.php index fc2e368..16ab380 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/password-reset.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/password-reset.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', 'Sign in') @section('body_class','login') diff --git a/src/resources/views/3rdparty-templates/auth/default-market/register-agreement.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/register-agreement.blade.php index a6fa3a0..cc643da 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/register-agreement.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/register-agreement.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원가입 > 약관동의') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/register-success.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/register-success.blade.php index bfbeb91..3d6978e 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/register-success.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/register-success.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원가입') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/register.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/register.blade.php index 52e84d5..1118b59 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/register.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/register.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원가입') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/reset-password.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/reset-password.blade.php index ef8d7bd..4dbcc4f 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/reset-password.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/reset-password.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원가입') @section('content')
diff --git a/src/resources/views/3rdparty-templates/auth/default-market/verify-email.blade.php b/src/resources/views/3rdparty-templates/auth/default-market/verify-email.blade.php index 42f6edc..d317857 100644 --- a/src/resources/views/3rdparty-templates/auth/default-market/verify-email.blade.php +++ b/src/resources/views/3rdparty-templates/auth/default-market/verify-email.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '회원가입') @section('content')
diff --git a/src/resources/views/admin/cancel-return-exchange/index.blade.php b/src/resources/views/admin/cancel-return-exchange/index.blade.php index 5e3de35..10ca551 100644 --- a/src/resources/views/admin/cancel-return-exchange/index.blade.php +++ b/src/resources/views/admin/cancel-return-exchange/index.blade.php @@ -29,13 +29,12 @@
types) && in_array('refund', request()->types)) checked @endif> + @inarray('refund', request()->types, 'checked')>
-
types) && in_array('exchange', request()->types)) checked @endif> + @inarray('exchange', request()->types, 'checked')>
@@ -96,8 +95,8 @@ @if($item->type == "exchange") {{$exchange_status[$item->status]}} - @elseif($item->type == "return") - {{$return_status[$item->status]}} + @elseif($item->type == "refund") + {{$refund_status[$item->status]}} @endif {{$item->o_id}} diff --git a/src/resources/views/admin/config/bank.blade.php b/src/resources/views/admin/config/bank.blade.php index 3f71e21..ab19cb9 100644 --- a/src/resources/views/admin/config/bank.blade.php +++ b/src/resources/views/admin/config/bank.blade.php @@ -35,7 +35,7 @@ @forelse($banks as $bank) - {{ config('pondol-market.banks.'.$bank->code.'.name') }} + {{ $codes[$bank->code]['name'] }} {{ $bank->no }} {{ $bank->owner }} diff --git a/src/resources/views/admin/config/delivery.blade.php b/src/resources/views/admin/config/delivery.blade.php index f965e19..5ae5d5b 100644 --- a/src/resources/views/admin/config/delivery.blade.php +++ b/src/resources/views/admin/config/delivery.blade.php @@ -19,15 +19,12 @@
- - -
배송비
- +
원 @@ -36,7 +33,7 @@
- + type == 'none' ? 'checked' : '' }} >
배송비 무료 @@ -45,7 +42,7 @@
- + type == 'on_delivery' ? 'checked' : '' }} >
배송비 착불 @@ -54,7 +51,7 @@
- + type == 'apply' ? 'checked' : '' }}>
구매액에 관계없이 배송비적용 @@ -63,35 +60,19 @@
- + type == 'partial' ? 'checked' : '' }}>
상품구매액이
- +
미만일 경우 배송비 적용
-{{-- - - 제품(수)당 배송비적용( - - 기본배송료+추가 수량당 - - 원 추가) -
- - - 추가배송료 - - (기본배송료에 추가배송료(장바구니에서 사용자 체크시 적용)) -
--}} - - - +
diff --git a/src/resources/views/admin/config/pg.blade.php b/src/resources/views/admin/config/pg.blade.php index 856afc0..ef562bf 100644 --- a/src/resources/views/admin/config/pg.blade.php +++ b/src/resources/views/admin/config/pg.blade.php @@ -20,30 +20,30 @@
- +
- +
- + service) checked @endif>
- + service) checked @endif>
@@ -51,11 +51,11 @@
- + naver) checked @endif>
- + kakao) checked @endif>
diff --git a/src/resources/views/admin/config/template.blade.php b/src/resources/views/admin/config/template.blade.php index a3b6aca..d13b049 100644 --- a/src/resources/views/admin/config/template.blade.php +++ b/src/resources/views/admin/config/template.blade.php @@ -19,7 +19,7 @@ @csrf
CI
- + @@ -33,7 +33,7 @@ @csrf
Favicon
- + @@ -42,14 +42,18 @@
- + +
- @foreach($layouts as $v) - + @endforeach
@@ -123,9 +127,9 @@ --}}
- @foreach($components as $v) - + @endforeach
@@ -148,6 +152,7 @@
+
@@ -156,7 +161,7 @@ @parent diff --git a/src/resources/views/admin/coupon/issue.blade.php b/src/resources/views/admin/coupon/issue.blade.php index fefce3d..45cc480 100644 --- a/src/resources/views/admin/coupon/issue.blade.php +++ b/src/resources/views/admin/coupon/issue.blade.php @@ -53,7 +53,6 @@ - @if($coupon->apply_amount_type == 'price')
diff --git a/src/resources/views/admin/order/index.blade.php b/src/resources/views/admin/order/index.blade.php index 55d9be2..963e66c 100644 --- a/src/resources/views/admin/order/index.blade.php +++ b/src/resources/views/admin/order/index.blade.php @@ -22,17 +22,18 @@
delivery_status) && in_array('ready', request()->delivery_status)) checked @endif> + @checkedtrue(isset(request()->delivery_status) && in_array('ready', request()->delivery_status))> +
delivery_status) && in_array('ing', request()->delivery_status)) checked @endif> + @checkedtrue(isset(request()->delivery_status) && in_array('ing', request()->delivery_status))>
delivery_status) && in_array('done', request()->delivery_status)) checked @endif> + @checkedtrue(isset(request()->delivery_status) && in_array('done', request()->delivery_status))>
diff --git a/src/resources/views/components/app-admin.blade.php b/src/resources/views/components/app-admin.blade.php index fc20f1a..f839447 100644 --- a/src/resources/views/components/app-admin.blade.php +++ b/src/resources/views/components/app-admin.blade.php @@ -8,7 +8,9 @@ @if(count($path)) @endif +
{{ $slot }} +
diff --git a/src/resources/views/components/partials/navigation-admin.blade.php b/src/resources/views/components/partials/navigation-admin.blade.php index eb89716..680acf3 100644 --- a/src/resources/views/components/partials/navigation-admin.blade.php +++ b/src/resources/views/components/partials/navigation-admin.blade.php @@ -197,9 +197,9 @@ class="dropdown-toggle"> dashboard
  • - log -
    • - + log + +
  • diff --git a/src/resources/views/market/templates/cart/default/cart.blade.php b/src/resources/views/market/templates/cart/default/cart.blade.php index 0cddeb6..d5a3a33 100644 --- a/src/resources/views/market/templates/cart/default/cart.blade.php +++ b/src/resources/views/market/templates/cart/default/cart.blade.php @@ -1,4 +1,4 @@ -@extends('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front') +@extends(market_theme('layouts').'.front') @section('title', '장바구니') @section('content') diff --git a/src/resources/views/market/templates/layouts/default-lnb/front.blade.php b/src/resources/views/market/templates/layouts/default-lnb/front.blade.php index cbfae8a..acbe85e 100644 --- a/src/resources/views/market/templates/layouts/default-lnb/front.blade.php +++ b/src/resources/views/market/templates/layouts/default-lnb/front.blade.php @@ -4,9 +4,9 @@ @section('page') - @include('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front-header') + @include(market_theme('layouts').'.front-header')
    - @include('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front-sidebar') + @include(market_theme('layouts').'.front-sidebar')
    @@ -16,7 +16,7 @@ @yield('content')
    - @include('market.templates.layouts.'.config('pondol-market.template.layout.theme').'.front-footer') + @include(market_theme('layouts').'.front-footer')
    diff --git a/src/resources/views/market/templates/layouts/default/front-footer.blade.php b/src/resources/views/market/templates/layouts/default/front-footer.blade.php index cd63f9c..ac44a48 100644 --- a/src/resources/views/market/templates/layouts/default/front-footer.blade.php +++ b/src/resources/views/market/templates/layouts/default/front-footer.blade.php @@ -1,31 +1,17 @@ - - - +$company = jsonval('company') +@endphp