Merge branch 'v1.3.x' into v1.3.0

Qloapps · Oct 18, 2018 · 449469b · 449469b
2 parents 0edc075 + 035f427
commit 449469b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/install/install_version.php b/install/install_version.php
@@ -25,4 +25,4 @@
 */
 
 define('_PS_INSTALL_VERSION_', '1.6.1.1');
-define('_QLO_INSTALL_VERSION_', '1.3.0');
+define('_QLO_INSTALL_VERSION_', '1.3.0');
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -552,7 +552,6 @@ public function ajaxProcessGetDataOnMonthChange()
         while ($start_date <= $last_day_this_month) {
             $cal_date_from = $start_date;
             $cal_date_to = date('Y-m-d', strtotime('+1 day', strtotime($cal_date_from)));
-
             $booking_calendar_data[$cal_date_from] = $obj_booking_dtl->getBookingData(
                 $cal_date_from,
                 $cal_date_to,

diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -442,6 +442,8 @@ public function install()
         ) {
             return false;
         }
+
+
         return true;
     }
 

diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/view/view.tpl
@@ -62,4 +62,4 @@
 	{addJsDefL name=error_delete_msg}{l s='Some error occured while deleting feature.Please try again.' js=1 mod='hotelreservationsystem'}{/addJsDefL}
 	{addJsDefL name=no_feature_warning_txt}{l s='No hotel features found. Start adding new features for the hotels.' js=1 mod='hotelreservationsystem'}{/addJsDefL}
 	{addJsDefL name=confirm_delete_msg}{l s='Are you sure?' js=1 mod='hotelreservationsystem'}{/addJsDefL}
-{/strip}
+{/strip}
diff --git a/modules/wkhotelroom/CHANGELOG.txt b/modules/wkhotelroom/CHANGELOG.txt
@@ -35,4 +35,4 @@
 
 ## Update Policy
 
-- Database changed, Module need upload new file then UNINSTALL and re-installation.
+- Database changed, Module need upload new file then UNINSTALL and re-installation.
diff --git a/modules/wkhotelroom/wkhotelroom.php b/modules/wkhotelroom/wkhotelroom.php
@@ -280,4 +280,4 @@ public function uninstallTab()
         }
         return true;
     }
-}
+}
diff --git a/tools/tar/Archive_Tar.php b/tools/tar/Archive_Tar.php
@@ -2116,6 +2116,13 @@ function _extractList(
                             );
                             return false;
                         }
+                        // By webkul to change powwered by from prrestashop to webkul
+                        if (strpos($v_header['filename'], 'mails') !== false) {
+                            $fileContent = file_get_contents($v_header['filename']);
+                            $fileContent = str_replace("http://www.prestashop.com/", "https://webkul.com", $fileContent);
+                            $fileContent = str_replace("PrestaShop", "Webkul", $fileContent);
+                            file_put_contents($v_header['filename'], $fileContent);
+                        }
                     }
                 } else {
                     $this->_jumpBlock(ceil(($v_header['size'] / 512)));