Skip to content

Commit

Permalink
Merge pull request #436 from hongoctrien/develop
Browse files Browse the repository at this point in the history 
Update z-index tabs
  • Loading branch information
@vuthao
vuthao committed Aug 24, 2015
2 parents 2a63e22 + fd83b37 commit 08a9f5c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions modules/shops/admin/items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
$xtpl->assign( 'BASE_URL_PNUMBER', $base_url_product_number );
$xtpl->assign( 'BASE_URL_NUM_SELL', $base_url_num_sell );

$base_url = NV_BASE_ADMINURL . 'index.php?' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $op . '&per_page=' . $per_page . '&catid=' . $catid . '&stype=' . $stype . '&q=' . $q . '&checkss=' . $checkss . '&ordername=' . $ordername . '&order=' . $order;
$base_url = NV_BASE_ADMINURL . 'index.php?' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $op . '&per_page=' . $per_page . '&catid=' . $catid . '&stype=' . $stype . '&q=' . $q . '&checkss=' . $checkss . '&ordername=' . $ordername . '&order=' . $order;
$ord_sql = ($ordername == 'title' ? NV_LANG_DATA . '_title' : $ordername) . ' ' . $order;
$db->sqlreset( )->select( 'id, listcatid, user_id, homeimgfile, homeimgthumb, ' . NV_LANG_DATA . '_title, ' . NV_LANG_DATA . '_alias, hitstotal, status, edittime, publtime, exptime, product_number, product_price, money_unit, product_unit, num_sell, username' )->from( $from )->order( $ord_sql )->limit( $per_page )->offset( ($page - 1) * $per_page );
$result = $db->query( $db->sql( ) );
Expand Down Expand Up @@ -409,7 +409,7 @@
$xtpl->assign( 'ROW', array(
'id' => $id,
'link' => NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $global_array_shops_cat[$catid_i]['alias'] . '/' . $alias . $global_config['rewrite_exturl'],
'link_seller' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=seller&pro_id=' . $id . '&nv_redirect=' . nv_base64_encode( $base_url ),
'link_seller' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=seller&pro_id=' . $id . '&nv_redirect=' . nv_redirect_encrypt( $base_url ),
'link_copy' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=content&copy&id=' . $id,
'link_warehouse' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=warehouse&listid=' . $id . '&checkss=' . md5( $global_config['sitekey'] . session_id() ),
'title' => $title,
Expand Down
3 changes: 2 additions & 1 deletion modules/shops/admin/seller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

$pro_id = $nv_Request->get_int( 'pro_id', 'get', 0 );
$nv_redirect = $nv_Request->get_title( 'nv_redirect', 'get', '' );
$nv_redirect = nv_redirect_decrypt( $nv_redirect );

if( empty( $pro_id ) )
{
Expand Down Expand Up @@ -51,7 +52,7 @@
$xtpl->assign( 'NV_OP_VARIABLE', NV_OP_VARIABLE );
$xtpl->assign( 'MODULE_NAME', $module_name );
$xtpl->assign( 'OP', $op );
$xtpl->assign( 'C_LIST', nv_base64_decode( $nv_redirect ) );
$xtpl->assign( 'C_LIST', nv_redirect_encrypt( $nv_redirect ) );

$db->select( 't2.order_name, t2.order_email, t2.order_phone, t2.order_address, t2.unit_total, t2.order_time, t1.num, t1.price' )
->order( 't1.order_id DESC' )
Expand Down
4 changes: 2 additions & 2 deletions modules/shops/funcs/history.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

if( ! defined( 'NV_IS_USER' ) )
{
$redirect = NV_BASE_SITEURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=cart";
Header( "Location: " . NV_BASE_SITEURL . "index.php?" . NV_NAME_VARIABLE . "=users&" . NV_OP_VARIABLE . "=login&nv_redirect=" . nv_base64_encode( $redirect ) );
$redirect = NV_BASE_SITEURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=cart";
Header( "Location: " . NV_BASE_SITEURL . "index.php?" . NV_NAME_VARIABLE . "=users&" . NV_OP_VARIABLE . "=login&nv_redirect=" . nv_redirect_encrypt( $redirect ) );
die();
}

Expand Down
2 changes: 1 addition & 1 deletion modules/shops/funcs/loadcart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
$total_old = $total;
}

if( ( empty( $counpons['total_amount'] ) or $total > $counpons['total_amount'] ) and NV_CURRENTTIME >= $counpons['date_start'] and ( empty( $counpons['uses_per_coupon'] ) or $counpons['uses_per_coupon_count'] < $counpons['uses_per_coupon'] ) and ( empty( $counpons['date_end'] ) or NV_CURRENTTIME < $counpons['date_end'] ) )
if( ( empty( $counpons['total_amount'] ) or $total >= $counpons['total_amount'] ) and NV_CURRENTTIME >= $counpons['date_start'] and ( empty( $counpons['uses_per_coupon'] ) or $counpons['uses_per_coupon_count'] < $counpons['uses_per_coupon'] ) and ( empty( $counpons['date_end'] ) or NV_CURRENTTIME < $counpons['date_end'] ) )
{
// Ap dung giam gia cho tung san pham dac biet
if( $total_coupons > 0 )
Expand Down
6 changes: 3 additions & 3 deletions modules/shops/funcs/order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

if( !defined( 'NV_IS_USER' ) and !$pro_config['active_guest_order'] )
{
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=cart';
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_base64_encode( $redirect ) );
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=cart';
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_redirect_encrypt( $redirect ) );
die( );
}
$contents = '';
Expand Down Expand Up @@ -160,7 +160,7 @@
}
$total += $total_weight_price;

if( ( $total > $counpons['total_amount'] or empty( $total ) ) and NV_CURRENTTIME >= $counpons['date_start'] and ( $counpons['uses_per_coupon_count'] < $counpons['uses_per_coupon'] or empty( $counpons['uses_per_coupon'] ) ) and ( empty( $counpons['date_end'] ) or NV_CURRENTTIME < $counpons['date_end'] ) )
if( ( $total >= $counpons['total_amount'] or empty( $total ) ) and NV_CURRENTTIME >= $counpons['date_start'] and ( $counpons['uses_per_coupon_count'] < $counpons['uses_per_coupon'] or empty( $counpons['uses_per_coupon'] ) ) and ( empty( $counpons['date_end'] ) or NV_CURRENTTIME < $counpons['date_end'] ) )
{
// Ap dung giam gia cho tung san pham dac biet
if( $total_coupons > 0 )
Expand Down
4 changes: 2 additions & 2 deletions modules/shops/funcs/point.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

if( !defined( 'NV_IS_USER' ) )
{
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=point';
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_base64_encode( $redirect ) );
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=point';
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_redirect_encrypt( $redirect ) );
die( );
}

Expand Down
4 changes: 2 additions & 2 deletions modules/shops/funcs/wishlist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

if( ! defined( 'NV_IS_USER' ) )
{
$redirect = nv_url_rewrite( NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name, true );
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_base64_encode( $redirect ) );
$redirect = nv_url_rewrite( NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name, true );
Header( 'Location: ' . NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_redirect_encrypt( $redirect ) );
die();
}

Expand Down
6 changes: 3 additions & 3 deletions modules/shops/theme.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1834,8 +1834,8 @@ function cart_product( $data_content, $coupons_code, $order_info, $array_error_n
}
else
{
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=cart';
$login = NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_base64_encode( $redirect );
$redirect = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=cart';
$login = NV_BASE_SITEURL . 'index.php?' . NV_NAME_VARIABLE . '=users&' . NV_OP_VARIABLE . '=login&nv_redirect=' . nv_redirect_encrypt( $redirect );
$xtpl->assign( 'point_note', sprintf( $lang_module['point_cart_note_guest'], $point_total, $login ) );
}
$xtpl->parse( 'main.point_note' );
Expand Down Expand Up @@ -3076,7 +3076,7 @@ function nv_download_content( $data_content )

if( $login > 0 )
{
$link_login = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=users&amp;' . NV_OP_VARIABLE . '=login&amp;nv_redirect=' . nv_base64_encode( $client_info['selfurl'] . '#'.$linktab );
$link_login = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=users&amp;' . NV_OP_VARIABLE . '=login&amp;nv_redirect=' . nv_redirect_encrypt( $client_info['selfurl'] . '#'.$linktab );
$xtpl->assign( 'DOWNLOAD_LOGIN', '<a title="' . $lang_global['loginsubmit'] . '" href="' . $link_login . '">' . $lang_module['download_login'] . '</a>' );
$xtpl->parse( 'main.form_login' );
}
Expand Down
1 change: 1 addition & 0 deletions themes/default/css/shops.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,7 @@ img.calendar {
overflow: hidden;
margin: 1em 0 1em;
font-weight: 300;
z-index: 0
}

/* Nav */
Expand Down

0 comments on commit 08a9f5c

Please sign in to comment.