diff --git a/application/controllers/information.php b/application/controllers/information.php index b69108cc..8ba2e259 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1199,9 +1199,11 @@ class Information extends CI_Controller public function test_price() { - $price_rule = '
#ah-8,st,2#
#ah-8,st,2#
'; - $price_tag_list = $this->parse_price_tag($price_rule); - var_dump($price_tag_list); + $price_rule = '
#ah-23,st,2#
'; + $price_item_array = $this->price_pregmatch($price_rule); + var_dump($price_item_array); + $price_tag_list = $this->parse_price_tag($price_rule); + var_dump($price_tag_list); } /*! diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index f36de899..790f69a7 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -46,109 +46,116 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -158,34 +165,43 @@

10-17 yrs old

+

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 3d54d8f0..fa9f4666 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -42,112 +42,118 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -157,34 +163,43 @@

10-17 yrs old

+

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/ah-recommends-tour.php index 6a084d16..314c4edf 100644 --- a/application/views/mobile_first/ah-recommends-tour.php +++ b/application/views/mobile_first/ah-recommends-tour.php @@ -1,12 +1,11 @@
-
You might be interested in:
- +
Explore similar itineraries:
<?php echo $recommands['Content Tour A']->ic_title; ?> @@ -23,7 +22,7 @@
<?php echo $recommands['Content Tour B']->ic_title; ?> @@ -41,7 +40,7 @@
<?php echo $recommands['Content Tour C']->ic_title; ?> @@ -58,7 +57,7 @@
<?php echo $recommands['Content Tour D']->ic_title; ?> @@ -71,41 +70,5 @@
- - -
- <?php echo $recommands['Content Tour E']->ic_title; ?> - -
ic_title; ?> -
-
-
-
- - - - -
- <?php echo $recommands['Content Tour F']->ic_title; ?> - -
ic_title; ?> -
-
-
-
- -
\ No newline at end of file diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index c1f4589b..45afd392 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -49,112 +49,120 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -164,34 +172,43 @@

10-17 yrs old

+

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 481a1382..db79325e 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -43,112 +43,120 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -158,34 +166,43 @@

10-17 yrs old

+

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php index 060b8154..b563833f 100644 --- a/application/views/mobile_first/gh-info-page-form.php +++ b/application/views/mobile_first/gh-info-page-form.php @@ -49,113 +49,117 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -166,50 +170,53 @@ +

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php index 64ed34e0..2693e467 100644 --- a/application/views/mobile_first/gh-tour-form.php +++ b/application/views/mobile_first/gh-tour-form.php @@ -43,113 +43,115 @@

65+ yrs old

+

people

41-64 yrs old

+

people

18-40 yrs old

+

people

@@ -160,50 +162,53 @@ +

people

3-9 yrs old

+

people

0-2 yrs old

+

people

diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index db756a63..49d98b22 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -55,12 +55,13 @@ class Note_model extends CI_Model { public function notestatus($topnum = 2, $status = '') { $this->init(); $this->topnum = $topnum; + $sql = " AND pn_memo NOT LIKE '{\"id\":\"WH-%' "; $x_status = strtolower($status) === 'reversal' ? 'revers' : $status; $sql1 = in_array(strtolower($status), ["completed", 'pending']) ? " AND (pn_payment_status='$status' ) " : ""; $sql2 = in_array(strtolower($status), ["refunded", "reversal"]) ? " AND (pn_payment_status like '%$x_status%' ) " : ""; $sql3 = in_array(strtolower($status), ["others"]) ? " AND (pn_payment_status='failed' OR pn_payment_status='denied' ) " : ""; $sql4 = in_array(strtolower($status), ["case"]) ? " AND (pn_memo like '{\"txn_type\":\"new_case\"%' AND pn_mc_gross = '0' ) " : ""; - $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4; + $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4 . $sql; // $this->orderby=" ORDER BY pn_payment_date DESC, pn.pn_sn ASC "; $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; return $this->get_list(); @@ -77,10 +78,10 @@ class Note_model extends CI_Model { public function search_date($date) { $this->init(); - $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) "; + $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) AND pn_memo NOT LIKE '{\"id\":\"WH-%' "; // {"id":"WH- $this->search = $search_sql; // $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; - $this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1 ELSE 9 END ,pn.pn_sn DESC "; + $this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1 WHEN pn.pn_send = 'sendfail' THEN 2 ELSE 9 END ,pn.pn_sn DESC "; // WHEN pn.pn_send = 'sendfail' THEN 2 return $this->get_list();