Merge pull request #55 from rohit053/v1.3.1

V1.3.1 released: Stats Modules Added + added travis
Qloapps · Nov 1, 2018 · 0533e5f · 0533e5f
2 parents e13d07f + 102343d
commit 0533e5f
Show file tree

Hide file tree

Showing 429 changed files with 2,637 additions and 9,619 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,16 @@ dist: trusty
 php:
   - 5.6
   - 7.2
+
+before_script:
+  - sudo cp -f tests/travis-ci-apache-vhost /etc/apache2/sites-available/default
+  - sudo cp -Rf . /var/www/qloapps.unit.test
+  - sudo chmod 777 -R /var/www/
+  - sudo service apache2 restart
+
+script:
+  - cd /var/www/qloapps.unit.test/tests && bash getcomposer.sh && php composer.phar install && php vendor/bin/phpunit -c .
+
 after_script:
   - sudo cat /var/log/apache2/error.log
 
@@ -23,4 +33,4 @@ after_failure:
   - cat /etc/apache2/sites-available/000-default.conf
   - sudo cat /var/log/php-fpm.log
   - sudo ls -l /var/log/apache2
-  - sudo cat /var/log/apache2/other_vhosts_access.log
+  - sudo cat /var/log/apache2/other_vhosts_access.log
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,23 @@
+####################################
+# V1.3.1
+####################################
+
+## Added Features:
+
+[+] BO : All already compatible Stats module are installed to the qloapps now.
+
+
+## Improved/changed features:
+
+[+] BO : Hotel name is shown in the Room Type Booking list and Room Type booking status tables.
+[+] FO : Hotel name is shown in the Customer shopping list, Order confirmation and order details booking lists.
+
+
+## Bug/Issues Resolved:
+
+[-] CO : Resolved :: When set up the new install, the upload_max_filesize value in the php.ini file less than 16M, but the error message is displaying for memory_limit.
+
+
 ####################################
 # V1.3.0
 ####################################
@@ -13,6 +33,7 @@
 [+] CO : System compatibility check for Qloapps installation improved .
 
 
+
 ####################################
 # V1.2.0
 ####################################
@@ -321,4 +342,4 @@
 [-] MO : wktestimonialblock : Fixed while adding the image in valid format on configuration page then showing error page.
 [-] MO : wkpaypaladaptive : Fixed paypal is not working because paypal api has been changed.
 [-] MO : wkpaypaladaptive : Fixed fopen issues fixed, done by CURL.
-[-] MO : wkpaypaladaptive : Fixed payment negative value bug fixed.
+[-] MO : wkpaypaladaptive : Fixed payment negative value bug fixed.
diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl
@@ -33,6 +33,11 @@
 	<td class="text-center">
 		{$data.room_type}
 	</td>
+	<td class="text-center">
+		<a href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
+			<span>{$data['hotel_name']}</span>
+		</a>
+	</td>
 	<td class="text-center">
 		<span class="booking_duration_show">{$data.date_from|date_format:"%d-%m-%Y"}&nbsp-&nbsp {$data.date_to|date_format:"%d-%m-%Y"}</span>
 
@@ -63,7 +68,7 @@
 		<span class="product_original_price {if $data.feature_price_diff > 0}room_type_old_price{/if}" {if $data.feature_price_diff < 0} style="display:none;"{/if}>
         	{convertPriceWithCurrency price=$data.unit_price_without_reduction_tax_incl currency=$currency->id}
 		</span>&nbsp;
-        <span class="room_type_current_price" {if !$data.feature_price_diff}style="display:none;"{/if}>	
+        <span class="room_type_current_price" {if !$data.feature_price_diff}style="display:none;"{/if}>
 			{convertPriceWithCurrency price=$data.paid_unit_price_tax_incl currency=$currency->id}
         </span>
 	</td>
@@ -91,7 +96,7 @@
 		</div>
 		{/if}
 	</td>
-	
+
 	<td class="text-center stage_name">
 		<p>
 			{if isset($data['stage_name']) && $data['stage_name']}
@@ -173,6 +178,6 @@
 		.room_type_old_price {
 			text-decoration: line-through;
 			color:#979797;
-			font-size:12px; 
+			font-size:12px;
 		}
 	</style>
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -280,6 +280,7 @@
 									<table class="table table-responsive">
 										<tr>
 											<th>{l s='Room No.'}</th>
+											<th>{l s='Hotel Name'}</th>
 											<th>{l s='Date From'}</th>
 											<th>{l s='Date To'}</th>
 											<th>{l s='Order Status'}</th>
@@ -290,6 +291,11 @@
 											<td>
 												{$data['room_num']}
 											</td>
+											<td>
+												<a href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
+													<span>{$data['hotel_name']}</span>
+												</a>
+											</td>
 											<td>
 												{$data['date_from']|date_format:"%d-%m-%Y"}
 											</td>
@@ -301,7 +307,7 @@
 													<select style="display:inline;width:40%;" name="booking_order_status">
 													{foreach from=$hotel_order_status item=state}
 														<option value="{$state['id']|intval}" {if isset($data.id_status) && $state.id == $data.id_status} selected="selected" disabled="disabled"{/if}>{$state.status|escape}</option>
-													{/foreach} 
+													{/foreach}
 													</select>
 													<input type="hidden" name="date_from" value="{$data['date_from']}" />
 													<input type="hidden" name="date_to" value="{$data['date_to']}" />
@@ -319,7 +325,7 @@
 											<td>{l s='No data found.'}</td>
 										</tr>
 										{/if}
-									</table>	
+									</table>
 								</div>
 							</div>
 						</div>
@@ -969,6 +975,7 @@
 										<th class="text-center"><span class="title_box">{l s='Room No.'}</span></th>
 										<th class="text-center"><span class="title_box">{l s='Room Image'}</th>
 										<th class="text-center"><span class="title_box">{l s='Room Type'}</span></th>
+										<th class="text-center"><span class="title_box">{l s='Hotel Name'}</span></th>
 										<th class="text-center"><span class="title_box">{l s='Duration'}</span></th>
 										<th class="text-center"><span class="title_box">{l s='Unit Price'}</span></th>
 										<th class="text-center"><span class="title_box">{l s='Total Price'}</span></th>
@@ -1096,7 +1103,7 @@
 								{/if}
 							</div>
 						</div> <!-- by webkul to hide unnessary things in the page--> *}
-						
+
 						<!-- For Due amount submit panel (by webkul) -->
 						{if isset($order_adv_dtl)}
 							<div class="col-xs-6">
@@ -1134,17 +1141,17 @@
 															</div>
 														</td>
 													</tr>
-												{/if}	
+												{/if}
 											</table>
 										</div>
 										{if ($order_adv_dtl['total_order_amount'] - $order_adv_dtl['total_paid_amount'])|round:2 > 0}
 											<button type="submit" class="btn btn-primary" name="payDueAmount" style="margin-top:10px;">{l s="Submit Amount"}</button>
-										{/if}	
+										{/if}
 									</form>
 								</div>
 							</div>
 						{/if}
-						
+
 						<div class="col-xs-6 pull-right">
 							<div class="panel panel-vouchers" style="{if !sizeof($discounts)}display:none;{/if}">
 								{if (sizeof($discounts) || $can_edit)}
@@ -1281,9 +1288,9 @@
 												</td>
 											</tr>
 										{/if}
-										
+
 										{assign var=order_total_price value=$order->total_paid_tax_incl}
-										
+
 										<tr id="total_order">
 											<td class="text-right"><strong>{l s='Total'}</strong></td>
 											<td class="amount text-right nowrap">
@@ -1643,7 +1650,7 @@
 				$(".realloc_avail_rooms_container").empty().text(no_rm_avail_txt);
 			}
 		});
-		
+
 		/*For reallocating rooms in the modal*/
 		$("#realloc_allocated_rooms").on('click', function(e){
 			$(".error_text").text('');
@@ -1663,7 +1670,7 @@
 				return false;
 			}
 		});
-	
+
 		/*END*/
 
 		$(".textarea-autosize").autosize();

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
@@ -1892,11 +1892,20 @@ public function renderView()
         $htl_booking_data_order_id = $obj_bookin_detail->getBookingDataByOrderId(Tools::getValue('id_order'));
         if ($htl_booking_data_order_id) {
             $obj_htl_rm_info = new HotelRoomInformation();
+            $objHtlBranchInfo = new HotelBranchInformation();
             foreach ($htl_booking_data_order_id as $key => $value) {
                 $htl_booking_data_order_id[$key]['room_num'] = $obj_htl_rm_info->getHotelRoomInfoById($value['id_room']);
                 $htl_booking_data_order_id[$key]['order_status'] = $value['id_status'];
                 $htl_booking_data_order_id[$key]['date_from'] = $value['date_from'];
                 $htl_booking_data_order_id[$key]['date_to'] = $value['date_to'];
+                //enter hotel name
+                $hotelInfo = $objHtlBranchInfo->hotelBranchesInfo(
+                    Configuration::get('PS_LANG_DEFAULT'),
+                    2,
+                    0,
+                    $value['id_hotel']
+                );
+                $htl_booking_data_order_id[$key]['hotel_name'] = $hotelInfo['hotel_name'];
             }
         }
         $htl_order_status = HotelOrderStatus::getAllHotelOrderStatus();
@@ -2897,7 +2906,7 @@ public function ajaxProcessEditProductOnOrder()
 
         /*By webkul to edit the Hotel Cart and Hotel Order tables when editing the room for the order detail page*/
         $update_htl_tables = $obj_booking_detail->UpdateHotelCartHotelOrderOnOrderEdit($id_order, $id_room, $old_date_from, $old_date_to, $new_date_from, $new_date_to);
-        
+
         //Update Order Info in Customer Advance payment table
         $obj_customer_adv = new HotelCustomerAdvancedPayment();
         $obj_customer_adv->updateAdvancePaymentInfoOnOrderEdit($id_order);

diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
@@ -109,6 +109,7 @@ public function initContent()
 
             $cartOrders = Order::getAllOrdersByCartId($order->id_cart);
             if ($cartOrders) {
+                $objHtlBranchInfo = new HotelBranchInformation();
                 $obj_cart_bk_data = new HotelCartBookingData();
                 $obj_htl_bk_dtl = new HotelBookingDetail();
                 $obj_rm_type = new HotelRoomType();
@@ -222,6 +223,15 @@ public function initContent()
 
                                 $feature_price_diff = (float)($cart_htl_data[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']);
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff;
+
+                                //enter hotel name
+                                $hotelInfo = $objHtlBranchInfo->hotelBranchesInfo(
+                                    Configuration::get('PS_LANG_DEFAULT'),
+                                    2,
+                                    0,
+                                    $data_v['id_hotel']
+                                );
+                                $cart_htl_data[$type_key]['hotel_name'] = $hotelInfo['hotel_name'];
                             }
                         }
                     }

diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
@@ -323,7 +323,7 @@ public function initContent()
                 //by webkul to show order details properly on order history page
                 if (Module::isInstalled('hotelreservationsystem')) {
                     require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php';
-
+                    $objHtlBranchInfo = new HotelBranchInformation();
                     $obj_cart_bk_data = new HotelCartBookingData();
                     $obj_htl_bk_dtl = new HotelBookingDetail();
                     $obj_rm_type = new HotelRoomType();
@@ -427,6 +427,15 @@ public function initContent()
 
                                 $feature_price_diff = (float)($cart_htl_data[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']);
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff;
+
+                                //enter hotel name
+                                $hotelInfo = $objHtlBranchInfo->hotelBranchesInfo(
+                                    Configuration::get('PS_LANG_DEFAULT'),
+                                    2,
+                                    0,
+                                    $data_v['id_hotel']
+                                );
+                                $cart_htl_data[$type_key]['hotel_name'] = $hotelInfo['hotel_name'];
                             }
                         }
                         $redirect_link_terms = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id);

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
@@ -475,7 +475,7 @@ public function initContent()
 
                             if (count($avai_rm['rm_data'][0]['data']['available']) < count($cl_val['id_rms'])) {
                                 $cartChanged = true;
-                                
+
                                 foreach ($cl_val['id_rms'] as $cr_key => $cr_val) {
                                     $isRmBooked = $obj_htl_bk_dtl->chechRoomBooked($cr_val, $cl_val['date_from'], $cl_val['date_to']);
                                     if ($isRmBooked) {
@@ -502,7 +502,7 @@ public function initContent()
                     if ($cart_htl_data) {
                         $this->context->smarty->assign('cart_htl_data', $cart_htl_data);
                     }
-                    
+
                     // For Advanced Payment
                     $advance_payment_active = Configuration::get('WK_ALLOW_ADVANCED_PAYMENT');
                     if ($advance_payment_active) {

diff --git a/install/controllers/http/system.php b/install/controllers/http/system.php
@@ -95,9 +95,9 @@ public function display()
                         'curl' => $this->l('Curl extension is not loaded'),
                         'soap' => $this->l('SOAP extension is not loaded'),
                         'simplexml' => $this->l('SimpleXml extension is not loaded'),
-                        'upload_max_filesize' => $this->l('In the PHP configuration set memory_limit to minimum 128M'),
+                        'memory_limit' => $this->l('In the PHP configuration set memory_limit to minimum 128M'),
                         'max_execution_time' => $this->l('In the PHP configuration set max_execution_time to minimum 500'),
-                        'memory_limit' => $this->l('In the PHP configuration set upload_max_filesize to minimum 16M'),
+                        'upload_max_filesize' => $this->l('In the PHP configuration set upload_max_filesize to minimum 16M'),
                     )
                 ),
                 array(
@@ -160,4 +160,4 @@ public function display()
 
         $this->displayTemplate('system');
     }
-}
+}
diff --git a/install/fixtures/fashion/data/connections.xml b/install/fixtures/fashion/data/connections.xml
@@ -9,8 +9,8 @@
     <field name="id_shop"/>
   </fields>
   <entities>
-    <connections id="connections_1" id_guest="guest_1" id_page="1" ip_address="2130706433" id_shop_group="1" id_shop="1">
-      <http_referer>http://www.prestashop.com</http_referer>
+    <connections id="connections_1" id_guest="guest_1" id_page="1" ip_address="10424105181" id_shop_group="1" id_shop="1">
+      <http_referer>http://www.qloapps.com</http_referer>
     </connections>
   </entities>
 </entity_connections>
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.1');
diff --git a/install/models/install.php b/install/models/install.php
@@ -683,6 +683,20 @@ public function getModulesList()
                 'dashtrends',
                 'dashgoals',
                 'dashproducts',
+                'graphnvd3',
+                'statsdata',
+                'statsvisits',
+                'statsorigin',
+                'statslive',
+                'sekeywords',
+                'statssales',
+                'statspersonalinfos',
+                'pagesnotfound',
+                'statsnewsletter',
+                'statsregistrations',
+                'statsbestvouchers',
+                'statsbestcustomers',
+                'statsequipment',
                 'wkpaypaladaptive',
                 'wkfooterlangcurrencyblock',
                 'wkfooterexploreblock',

diff --git a/install/theme/views/welcome.phtml b/install/theme/views/welcome.phtml
@@ -1,7 +1,7 @@
 <?php $this->displayTemplate('header') ?>
 
 <?php if (Tools::getMemoryLimit() < Tools::getOctets('32M')): ?>
-	<div class="warnBlock"><?php echo $this->l('QloApps requires at least 32 MB of memory to run: please check the memory_limit directive in your php.ini file or contact your host provider about this.'); ?></div>
+	<div class="warnBlock"><?php echo $this->l('QloApps requires at least 128 MB of memory to run: please check the memory_limit directive in your php.ini file or contact your host provider about this.'); ?></div>
 <?php endif; ?>
 
 <?php if ($this->can_upgrade): ?>