Skip to content

Commit

Permalink
마일리지로인한 비회원 배송비 설정이 안되는 문제고침
Browse files Browse the repository at this point in the history
  • Loading branch information
bjrambo committed Apr 3, 2017
1 parent 433a152 commit 02a2448
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
8 changes: 5 additions & 3 deletions modules/ncart/m.skins/default/orderitems.html
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
</block>
<script>

<block cond="$logged_info" >
<block cond="$is_logged" >
var purchaser_name = '{$purchaser->name}';
<block cond="$config->address_input=='krzip'">
var purchaser_address = '{$purchaser->address[0]}';
Expand All @@ -216,9 +216,11 @@
var purchaser_cellphone = '{$purchaser->cellphone}';
var purchaser_telnum = '{$purchaser->telnum}';
var purchaser_chk = 'Y';
var my_mileage = {$my_mileage};
</block>
<block cond="!$logged_info" >
<block cond="!$is_logged" >
var purchaser_chk= 'N';
var my_mileage = 0;
</block>

var default_recipient = '{$default_address->recipient}';
Expand All @@ -228,7 +230,7 @@
var default_address = '{$address1}';
var default_address2 = '{$address2}';
var total_price = {$total_price};
var my_mileage = {$my_mileage};

var delivery_fee = {$delivery_fee};

(function($) {
Expand Down
6 changes: 2 additions & 4 deletions modules/ncart/ncart.mobile.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ function init()
Context::addJsFile('common/js/jquery.min.js');
Context::addJsFile('common/js/xe.min.js');

$logged_info = Context::get('logged_info');

if($logged_info)
if(Context::get('is_logged'))
{
Context::set('login_chk', 'Y');
}
else if(!Context::get('is_logged'))
else
{
Context::set('login_chk', 'N');
}
Expand Down
7 changes: 2 additions & 5 deletions modules/ncart/ncart.view.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@ function init()
$this->module_info->skin = 'default';
}
$skin = $this->module_info->skin;
$oModuleModel = getModel('module');
// 템플릿 경로 설정
$this->setTemplatePath(sprintf('%sskins/%s', $this->module_path, $skin));

$logged_info = Context::get('logged_info');

if($logged_info)
if(Context::get('is_logged'))
{
Context::set('login_chk', 'Y');
}
else if(!Context::get('is_logged'))
else
{
Context::set('login_chk', 'N');
}
Expand Down
7 changes: 4 additions & 3 deletions modules/ncart/skins/default/orderitems.html
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ <h3 class="title_paymentInfo">{$lang->input_payment_info}</h3>
</block>
<script>

<block cond="$logged_info" >
<block cond="$is_logged" >
var purchaser_name = '{$purchaser->name}';
<block cond="$config->address_input=='krzip'">
var purchaser_address = '{$purchaser->address[0]}';
Expand All @@ -234,9 +234,10 @@ <h3 class="title_paymentInfo">{$lang->input_payment_info}</h3>
var purchaser_cellphone = '{$purchaser->cellphone}';
var purchaser_telnum = '{$purchaser->telnum}';
var purchaser_chk = 'Y';
</block>
<block cond="!$logged_info" >
var my_mileage = {$my_mileage};
<block cond="!$is_logged" >
var purchaser_chk= 'N';
var my_mileage = 0;
</block>

var default_recipient = '{$default_address->recipient}';
Expand Down
6 changes: 4 additions & 2 deletions modules/ncart/skins/digital/orderitems.html
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ <h3 class="title_paymentInfo">{$lang->input_payment_info}</h3>
</block>
<script>

<block cond="$logged_info" >
<block cond="$is_logged" >
var purchaser_name = '{$purchaser->name}';
<block cond="$config->address_input=='krzip'">
var purchaser_address = '{$purchaser->address[0]}';
Expand All @@ -256,9 +256,11 @@ <h3 class="title_paymentInfo">{$lang->input_payment_info}</h3>
var purchaser_cellphone = '{$purchaser->cellphone}';
var purchaser_telnum = '{$purchaser->telnum}';
var purchaser_chk = 'Y';
var my_mileage = {$my_mileage};
</block>
<block cond="!$logged_info" >
<block cond="!$is_logged" >
var purchaser_chk= 'N';
var my_mileage = 0;
</block>

var default_recipient = '{$default_address->recipient}';
Expand Down
9 changes: 5 additions & 4 deletions modules/ncart/skins/en_eng/orderitems.html
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ <h3 class="title_paymentInfo">
</block>
<script>

<block cond="$logged_info" >
<block cond="$is_logged" >
var purchaser_name = '{$purchaser->name}';
<block cond="$config->address_input=='krzip'">
var purchaser_address = '{$purchaser->address[0]}';
Expand All @@ -247,9 +247,11 @@ <h3 class="title_paymentInfo">
var purchaser_cellphone = '{$purchaser->cellphone}';
var purchaser_telnum = '{$purchaser->telnum}';
var purchaser_chk = 'Y';
</block>
<block cond="!$logged_info" >
var my_mileage = {$my_mileage};
</block>
<block cond="!$is_logged" >
var purchaser_chk= 'N';
var my_mileage = 0;
</block>

var default_recipient = '{$default_address->recipient}';
Expand All @@ -259,7 +261,6 @@ <h3 class="title_paymentInfo">
var default_address = '{$address1}';
var default_address2 = '{$address2}';
var total_price = {$total_price};
var my_mileage = {$my_mileage};
var delivery_fee = {$delivery_fee};

(function($) {
Expand Down
2 changes: 1 addition & 1 deletion modules/nproduct/tpl/skin.js/orderitems.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
if (use_mileage < 0) use_mileage = 0;

raw_mileage = getRawPrice(use_mileage);

Z
if (total_price < raw_mileage && total_price <= my_mileage)
{
raw_mileage = total_price;
Expand Down

0 comments on commit 02a2448

Please sign in to comment.