Merge branch 'master' of github.com:hainatravel/information-system

.github/workflows/Deploy CN.yml

@@ -0,0 +1,37 @@
+#  .
+name: 🚀 Deploy INFO-SYS
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+jobs:
+  gh-win-cn-all-deploy:
+    name: 🎉 Deploy InfoSys to CN
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.CN_FTP_SERVER }}
+        username: ${{ secrets.CN_FTP_USER }}
+        password: ${{ secrets.CN_FTP_PASSWORD }}
+        port: ${{ secrets.CN_FTP_PORT }}
+        local-dir: ./
+        server-dir: /wwwroot/origin-cht.mycht.cn/
+        # dry-run: true
+        # log-level: verbose
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx

.github/workflows/Deploy.yml

@@ -0,0 +1,94 @@
+name: 🚀 Deploy INFO-SYS
+
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+
+jobs:
+  gh-win-us-deploy:
+    name: 🎉 Deploy InfoSys to US
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files to CHT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.US_FTP_SERVER }}
+        username: ${{ secrets.US_FTP_USER }}
+        password: ${{ secrets.US_FTP_PASSWORD }}
+        port: ${{ secrets.US_FTP_PORT }}
+        local-dir: ./
+        server-dir: /information-system/
+        # dry-run: true
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json
+    - name: 📂 Sync files to CT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.US_FTP_SERVER }}
+        username: ${{ secrets.US_FTP_USER }}
+        password: ${{ secrets.US_FTP_PASSWORD }}
+        port: ${{ secrets.US_FTP_PORT }}
+        local-dir: ./
+        server-dir: /origin-ct.mycht.cn/
+        # dry-run: true
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json
+
+  gh-win-cn-deploy:
+    needs: gh-win-us-deploy
+    name: 🎉 Deploy InfoSys to CN
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files to CHT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.CN_FTP_SERVER }}
+        username: ${{ secrets.CN_FTP_USER }}
+        password: ${{ secrets.CN_FTP_PASSWORD }}
+        port: ${{ secrets.CN_FTP_PORT }}
+        local-dir: ./
+        server-dir: /wwwroot/origin-cht.mycht.cn/
+        # dry-run: true
+        # log-level: verbose
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json

.gitignore

@@ -1,5 +1,7 @@
 .idea
-.phpintel
+.phpintel
+.*.json.bak
+.ftp-deploy-sync-state.json
 .svn/*
 */logs/log*
 /web.config
@@ -14,3 +16,4 @@
 /application/config/database.php
 
 
+

application/cache/.htaccess

@@ -1 +0,0 @@
-deny from all

application/cache/index.html

@@ -1,10 +0,0 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>

application/views/mobile_first/ah-lantern-festival-gp-form.php

@@ -3,7 +3,7 @@
     <h3 style="text-align: center; font-size: 20px; line-height: 22px;">Book this trip now. Your 1:1 travel consultant will reply within 1 working day.</h3>  
     <form action="https://www.asiahighlights.com/orders/lantern_save" method="post" novalidate="" id='gp_form'>
         <textarea id="form_additionalrequirements" name="additional_requirements" placeholder="If you have other requirements such as adding private transport on arrival and departure day, extending the trip : pre - or post-tour, please let us know .... (optional)"></textarea>
-		<div class="selectionBlock">
+		<div class="selectionBlock" style="margin-bottom: 0;">
 			<div id="adultBlock" >
 				<p style="margin-bottom: 0; font-size: 22px; text-align: left;">Traveler numbers for your group:</p>
 					<div class="peopleSelect" >
@@ -300,8 +300,8 @@
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
     <p style="font-size: 17px;
     color: #555;
-    margin-top: -10px;
+    margin-top: -5px;
-    margin-bottom: 5px;
+    margin-bottom: 15px;
     font-style: italic;
     padding-left: 0;
     line-height: 20px;
@@ -329,8 +329,13 @@
 						<label for="Video">Video appointment</label>
 					</div> 
    
-   
+                    <p style="
-    <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
+    clear: both;
+    margin: 40px 0 -30px 0;
+    font-style: italic;
+    color: #333;
+">A USD 200 deposit is required for each adult/child over 8. Please let us know if you need a single room or if you're traveling with children under 8. Any additional costs will be added to your balance.</p>
+    <button class="sendButton" id="submit_gp_form" type="button">Proceed to Payment</button>
         <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />

application/views/mobile_first/gh-pc.php

@@ -72,6 +72,43 @@
                     <li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
+                                <div class="inspirationlist vacationtype">
+                                    <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
+                                        <ul class="inspiration">
+                                            <li><a href="/egypt/tours">Egypt
+                                                </a></li>
+                                            <li><a href="/israel/plan-a-trip">Israel
+                                                </a></li>
+                                            <li><a href="/jordan/plan-a-trip">Jordan
+                                                </a></li>
+                                            <li><a href="/turkey/tours">Turkey
+                                                </a></li>
+                                            <li><a href="/morocco/tours">Moroco
+                                                </a></li>
+                                        </ul>
+                                    </div>
+                                    <div class="inspirationlist vacationtype">
+                                        <div class="inspirationtitle">Southeast Asia</div>
+                                        <ul class="inspiration">
+                                            <li><a href="https://www.asiahighlights.com/thailand/tours"
+                                                    target="_blank">Thailand</a></li>
+                                            <li> <a href="https://www.asiahighlights.com/vietnam/tours"
+                                                    target="_blank">Vietnam</a></li>
+                                            <li><a href="https://www.asiahighlights.com/cambodia/tours"
+                                                    target="_blank">Cambodia</a></li>
+                                            <li> <a href="https://www.asiahighlights.com/laos/trip-plan"
+                                                    target="_blank">Laos</a></li>
+                                            <li><a href="https://www.asiahighlights.com/myanmar/tours"
+                                                    target="_blank">Myanmar</a></li>
+                                            <li><a href="https://www.asiahighlights.com/singapore/plan-your-trip"
+                                                    target="_blank">Singapore</a>
+                                            </li>
+                                            <li><a href="https://www.asiahighlights.com/indonesia/bali/tours"
+                                                    target="_blank">Indonesia
+                                                    (Bali)</a></li>
+                                        </ul>
+                                    </div>
+
                                 <div class="inspirationlist vacationtype">
                                     <div class="inspirationtitle">North Asia</div>
 
@@ -88,29 +125,13 @@
                                                 Mongolia</a></li>
                                     </ul>
                                 </div>
-
                                 <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">Southeast Asia</div>
+                                    <div class="inspirationtitle">South America</div>
                                     <ul class="inspiration">
-                                        <li><a href="https://www.asiahighlights.com/thailand/tours"
+                                        <li><a href="/peru/2-week-itinerary">Peru</a></li>
-                                                target="_blank">Thailand</a></li>
-                                        <li> <a href="https://www.asiahighlights.com/vietnam/tours"
-                                                target="_blank">Vietnam</a></li>
-                                        <li><a href="https://www.asiahighlights.com/cambodia/tours"
-                                                target="_blank">Cambodia</a></li>
-                                        <li> <a href="https://www.asiahighlights.com/laos/trip-plan"
-                                                target="_blank">Laos</a></li>
-                                        <li><a href="https://www.asiahighlights.com/myanmar/tours"
-                                                target="_blank">Myanmar</a></li>
-                                        <li><a href="https://www.asiahighlights.com/singapore/plan-your-trip"
-                                                target="_blank">Singapore</a>
-                                        </li>
-                                        <li><a href="https://www.asiahighlights.com/indonesia/bali/tours"
-                                                target="_blank">Indonesia
-                                                (Bali)</a></li>
                                     </ul>
                                 </div>
-
+                            
                                 <div class="inspirationlist vacationtype">
                                     <div class="inspirationtitle">Central Asia</div>
                                     <ul class="inspiration">
@@ -119,27 +140,8 @@
                                                 and Central Asia</a></li>
                                     </ul>
                                 </div>
-                                <div class="inspirationlist vacationtype">
+                                
-                                <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
+                               
-                                    <ul class="inspiration">
-                                        <li><a href="/egypt/tours">Egypt
-                                            </a></li>
-                                        <li><a href="/israel/plan-a-trip">Israel
-                                            </a></li>
-                                        <li><a href="/jordan/plan-a-trip">Jordan
-                                            </a></li>
-                                        <li><a href="/turkey/tours">Turkey
-                                            </a></li>
-                                        <li><a href="/morocco/tours">Moroco
-                                            </a></li>
-                                    </ul>
-                                </div>
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">South America</div>
-                                    <ul class="inspiration">
-                                        <li><a href="/peru/2-week-itinerary">Peru</a></li>
-                                    </ul>
-                                </div>
                             </div>
 
                         </div>

application/views/mobile_first/gh.php

@@ -84,13 +84,12 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     <div class="menu__wrap">
         <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1" aria-owns="submenu-1">North Asia Destinations</a></li>
+<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8" aria-owns="submenu-8" href="/middle-east/tours">Middle East Destinations</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6">Southeast Asia Destinations</a></li>
+   <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6">Southeast Asia Destinations</a></li>           
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7" aria-owns="submenu-7">Central Asia Destinations</a></li>
+   <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1" aria-owns="submenu-1">North Asia Destinations</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8" aria-owns="submenu-8" href="/middle-east/tours">Middle East Destinations</a></li>
+             <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-9" aria-owns="submenu-9">South America Destinations</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-9" aria-owns="submenu-9">South America Destinations</a></li>
+            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7" aria-owns="submenu-7">Central Asia Destinations</a></li>     
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/destinations">All Destinations</a></li>
-
             <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">1 Week Itinerary</a></li>
             <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3" aria-owns="submenu-3">10 Days Itinerary</a></li>
             <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4">2 Weeks Itinerary</a></li>
@@ -98,7 +97,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
             <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-10">4 Weeks Itinerary</a></li>
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/about">About Us</a></li>
             <li class="menu__item" role="menuitem"><a href="/reviews" class="menu__link">Reviews</a></li>
-
         </ul>
         <!-- destinations -->
         <ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">