Skip to content

A
appju_www_encrypt
Commit 3826cdcb authored by platyhouse's avatar platyhouse
Browse files
Options

- encrypted

parent 0ff02847
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 57 deletions
modules/ptyshop/ptyshop.order.item.edit.admin.view.html
View file @ 3826cdcb
......@@ -15,6 +15,9 @@ $paidResult = json_decode($item->paidResult, true);
?>
<script src="<?= $this->request->moduleUrl ?>/ptyadmin/resources/AdminLTE-2.4.5/bower_components/ckeditor/ckeditor.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.32/angular.min.js"></script>
<script src="https://unpkg.com/@popperjs/core@2"></script>
<script src="https://unpkg.com/tippy.js@6"></script>
<div ng-app="myApp" ng-controller="MyCtrl">
<section class="content-header">
<h1>
......@@ -66,10 +69,12 @@ $paidResult = json_decode($item->paidResult, true);
<td>
<? foreach (ptyshopCartItemModel::getOrderStatus() as $v) { ?>
<? if ($it['status'] == $v) { ?>
<span class="animated flash label bg-red"><?= $v ?></span>
<span class="animated flash label bg-red" title="ttt"><?= $v ?></span>
<? } else { ?>
<? if ($v == '결제완료') { ?>
<span class="label bg-gray"><?= $v ?></span>
<? if ($v == '입금대기') { ?>
<span id=myButton class="label bg-gray" data-tippy-content="가상계좌의 입금대기 상태를 의미합니다"><?= $v ?></span>
<? } else if ($v == '결제완료') { ?>
<span id=myButton class="label bg-gray" data-tippy-content="결제완료 상태로는 변경할 수 없습니다"><?= $v ?></span>
<? } else { ?>
<a href='<?= $this->request->appUrl ?>/ptyshop/cart/setStatus/?id=<?= $it['id'] ?>&status=<?= urlencode($v) ?>' class="label bg-gray"><?= $v ?></a>
<? } ?>
......@@ -255,3 +260,27 @@ $paidResult = json_decode($item->paidResult, true);
</form>
</section>
</div>
<style>
.tippy-box[data-theme~='platyhouse'] {
background-color: #605ca8;
color: white;
font-size: 10px;
}
.tippy-box[data-theme~='platyhouse'][data-placement^='top'] > .tippy-arrow::before {
border-top-color: #605ca8;
}
.tippy-box[data-theme~='platyhouse'][data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: #605ca8;
}
.tippy-box[data-theme~='platyhouse'][data-placement^='left'] > .tippy-arrow::before {
border-left-color: #605ca8;
}
.tippy-box[data-theme~='platyhouse'][data-placement^='right'] > .tippy-arrow::before {
border-right-color: #605ca8;
}
</style>
<script>
tippy('[data-tippy-content]', {theme: 'platyhouse'});
</script>
modules/ptyshop/ptyshop.order.order.common.view.html
View file @ 3826cdcb
......@@ -1044,7 +1044,7 @@
<li>
<div class="chkbx">
<input id="paymethod2" type="radio" name="paymethod" value="wcard"
class="btn-paymethod">
class="btn-paymethod" checked>
<label for="paymethod2">신용카드(안심결제/ISP)</label>
</div>
</li>
......@@ -1081,7 +1081,7 @@
</ul>
</div>
<div class="order_form">
<div class="cardinfo" style="display: block;">
<div class="cardinfo" style="display: none;">
<table>
<caption>결제 입력폼 양식</caption>
<tbody>
......
modules/ptyshop/ptyshop.order.status.common.view.html
View file @ 3826cdcb
......@@ -753,14 +753,14 @@
"현재 교환 및 반품은 고객센터<br> 문의를 통해서만 가능합니다.<br><br> 고객센터 문의는 평일<br> 09:30~18:00에만 가능합니다."),
$('<div />', {"class": "layer_button_area customer"}).prepend(
$('<a />', {
"href": "tel:1544-3530",
"href": "tel:<?=$this->config->getConfig("ptyshop")->askPhoneNumber?>",
"class": "button"
}).html("고객센터 전화하기").click(function (e) {
$('body, .my_order_inner').removeClass('layer_open');
$('.notification_inner').remove();
$('html, body').scrollTop(scroll);
$('.layer_notification').hide();
window.location.href = "tel:1544-3530";
window.location.href = "tel:<?=$this->config->getConfig("ptyshop")->askPhoneNumber?>";
}), $('<a />', {
"class": "button"
}).html("카카오톡 문의하기").click(function (e) {
......@@ -999,7 +999,7 @@
<option value="4S">취소/환불 완료</option>
</select>
</div>-->
<p class="comment">주문/배송내역 확인 불가시 <a href="tel:1544-3530" class="underline">고객센터</a>를 이용해주세요.</p>
<p class="comment">주문/배송내역 확인 불가시 <a href="tel:<?=$this->config->getConfig("ptyshop")->askPhoneNumber?>" class="underline">고객센터</a>를 이용해주세요.</p>
</div>
<div class="list"></div>
<div class="button_more">
......
modules/ptyshop/ptyshop.order.statusDetail.common.view.html
View file @ 3826cdcb
......@@ -770,14 +770,14 @@
"현재 교환 및 반품은 고객센터<br> 문의를 통해서만 가능합니다.<br><br> 고객센터 문의는 평일<br> 09:30~18:00에만 가능합니다."),
$('<div />', {"class": "layer_button_area customer"}).prepend(
$('<a />', {
"href": "tel:1544-3530",
"href": "tel:<?=$this->config->getConfig("ptyshop")->askPhoneNumber?>",
"class": "button"
}).html("고객센터 전화하기").click(function (e) {
$('body, .my_order_inner').removeClass('layer_open');
$('.notification_inner').remove();
$('html, body').scrollTop(scroll);
$('.layer_notification').hide();
window.location.href = "tel:1544-3530";
window.location.href = "tel:<?=$this->config->getConfig("ptyshop")->askPhoneNumber?>";
}), $('<a />', {
"class": "button"
}).html("카카오톡 문의하기").click(function (e) {
......
modules/ptyshop/ptyshop.order.success.common.view.html
View file @ 3826cdcb
......@@ -47,61 +47,87 @@ namespace platyFramework;
<body class="complete_payment">
<div class="complete_message">
<p class="phrase">주문이 완료되었습니다.</p>
</div>
<? if (false) { ?>
<div class="order_info">
<h1 class="title">무통장 입금정보</h1>
<dl class="individual">
<dt>입금은행</dt>
<dd>기업은행</dd>
</dl>
<dl class="individual">
<dt>입금계좌</dt>
<dd></dd>
</dl>
<dl class="individual">
<dt>예금주</dt>
<dd>굿즈쉐어</dd>
</dl>
<dl class="individual">
<dt>입금기한</dt>
<dd>2021.03.15</dd>
</dl>
<dl class="individual">
<dt>결제금액</dt>
<dd class="total_price"><strong>6,800</strong><span>원</span>
</dd>
</dl>
<?
switch ($orderItem->paid) {
case -1:
$msg = "주문 및 결제가 진행중입니다";
break;
case 0:
$msg = "결제가 실패되었습니다";
break;
case 1:
$msg = "주문이 완료되었습니다";
break;
case 2:
$msg = "결제 대기 중입니다";
break;
} ?>
<p class="phrase"><?= $msg ?></p>
</div>
<?
$paidResult = json_decode($orderItem->paidResult, true);
//ptyDebug($orderItem);
//ptyDebug($paidResult);
?>
<? if ($orderItem->payMethod == "vbank") { ?>
<div class="order_info">
<h1 class="title">무통장 입금정보</h1>
<dl class="individual">
<dt>입금은행</dt>
<dd><?= $paidResult['inicis']['approvalResult']['P_FN_NM'] ?></dd>
</dl>
<dl class="individual">
<dt>입금계좌</dt>
<dd><?= $paidResult['inicis']['approvalResult']['P_VACT_NUM'] ?></dd>
</dl>
<dl class="individual">
<dt>예금주</dt>
<dd><?= $paidResult['inicis']['approvalResult']['P_VACT_NAME'] ?></dd>
</dl>
<dl class="individual">
<dt>입금기한</dt>
<dd><?
$date = sprintf("%s년 %s월 %s일",
substr($paidResult['inicis']['approvalResult']['P_VACT_DATE'], 0, 4),
substr($paidResult['inicis']['approvalResult']['P_VACT_DATE'], 4, 2),
substr($paidResult['inicis']['approvalResult']['P_VACT_DATE'], 6, 2));
echo $date;
?></dd>
</dl>
<dl class="individual">
<dt>결제금액</dt>
<dd class="total_price"><strong><?= number_format($orderItem->price) ?></strong><span>원</span>
</dd>
</dl>
</div>
<? } ?>
<div class="order_info">
<h1 class="title">주문 정보</h1>
<dl class="individual">
<dt>주문번호</dt>
<dd><?=$orderItem->orderId?></dd>
<dd><?= $orderItem->orderId ?></dd>
</dl>
<dl class="individual">
<dt>상품명</dt>
<dd><span class="name"><?=$orderItem->title?></span></dd>
<dd><span class="name"><?= $orderItem->title ?></span></dd>
</dl>
<? if (false) { ?>
<dl class="individual">
<dt>상품금액</dt>
<dd class="price"><strong><?=number_format($orderItem->price)?></strong><span>원</span></dd>
</dl>
<dl class="individual">
<dt>배송비</dt>
<dd class="price"><strong></strong><span>원</span></dd>
</dl>
<dl class="individual">
<dt>상품금액</dt>
<dd class="price"><strong><?= number_format($orderItem->price) ?></strong><span>원</span></dd>
</dl>
<dl class="individual">
<dt>배송비</dt>
<dd class="price"><strong></strong><span>원</span></dd>
</dl>
<? } ?>
<dl class="individual">
<dt>결제방식</dt>
<dd><?=$orderItem->getPaymethodTitle()?></dd>
<dd><?= $orderItem->getPaymethodTitle() ?></dd>
</dl>
<dl class="individual">
<dt>결제금액</dt>
<dd class="total_price"><strong><?=number_format($orderItem->price)?></strong><span>원</span></dd>
<dd class="total_price"><strong><?= number_format($orderItem->price) ?></strong><span>원</span></dd>
</dl>
</div>
......@@ -109,27 +135,27 @@ namespace platyFramework;
<h1 class="title">배송 정보</h1>
<dl class="individual">
<dt>수령자</dt>
<dd><?=$orderItem->deliveryName?></dd>
<dd><?= $orderItem->deliveryName ?></dd>
</dl>
<dl class="individual">
<dt>배송지</dt>
<dd><? echo "{$orderItem->deliveryAddress1} {$orderItem->deliveryAddress2}"?></dd>
<dd><? echo "{$orderItem->deliveryAddress1} {$orderItem->deliveryAddress2}" ?></dd>
</dl>
<dl class="individual">
<dt>연락처</dt>
<dd class="telephone"><?=$orderItem->getPhoneNumberFormat($orderItem->deliveryPhoneNumber)?></dd>
<dd class="telephone"><?= $orderItem->getPhoneNumberFormat($orderItem->deliveryPhoneNumber) ?></dd>
</dl>
<dl class="individual">
<dt>배송메모</dt>
<dd><?=$orderItem->deliveryMemo?></dd>
<dd><?= $orderItem->deliveryMemo ?></dd>
</dl>
</div>
<div class="button_area">
<a href="{{home}}/?userId=<?=urlencode($userId)?>" class="button_home">홈으로</a>
<a href="/ptyshop/order/get/?userId=<?=urlencode($userId)?>" class="buttom_order">주문/배송 조회</a>
<!-- <a href="/cart/get/?uid=a27b1d76-d4aa-3f11-b384-d6b8431e6a51" class="button_home">홈으로</a>-->
<!-- <a href="/order/get/?uid=a27b1d76-d4aa-3f11-b384-d6b8431e6a51" class="buttom_order">주문/배송 조회</a>-->
<a href="{{home}}/?userId=<?= urlencode($userId) ?>" class="button_home">홈으로</a>
<a href="/ptyshop/order/get/?userId=<?= urlencode($userId) ?>" class="buttom_order">주문/배송 조회</a>
<!-- <a href="/cart/get/?uid=a27b1d76-d4aa-3f11-b384-d6b8431e6a51" class="button_home">홈으로</a>-->
<!-- <a href="/order/get/?uid=a27b1d76-d4aa-3f11-b384-d6b8431e6a51" class="buttom_order">주문/배송 조회</a>-->
</div>
</body>
......
modules/ptyshop/resources/app.css
View file @ 3826cdcb
......@@ -820,7 +820,7 @@ body.option.bottom {position:absolute; bottom:0; left:0; width:100%; box-sizing:
/* 결제완료 */
.complete_payment {background-color:#f0f0f0;}
.complete_payment .complete_message {margin-top:10px; padding:25px 0 35px; background-color:#fff; border-bottom:1px solid #ebebeb; text-align:center;}
.complete_payment .complete_message .phrase {position:relative; padding:105px 20px 0; color:#1a1a1a; font-size:24px; letter-spacing:-0.02em;}
.complete_payment .complete_message .phrase {position:relative; padding:0px 20px 0; color:#1a1a1a; font-size:24px; letter-spacing:-0.02em;}
.complete_payment .complete_message .phrase:before {content:""; position:absolute; top:0; left:50%; margin-left:-40px; width:80px; height:80px; background: url(/modules/ptyshop/resources/ico_noti.svg) no-repeat;}
.complete_payment .complete_message .phrase.none:before {content:""; position:absolute; top:0; left:50%; margin-left:-40px; width:80px; height:80px; background: url(/modules/ptyshop/resources/ico_noti_none.svg) no-repeat;}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment