Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed the non required commented code from admin Import, updated the hotel import, and booking import process

Browse Source
This commit is contained in:
vishalsingh.qlo325
2024-07-27 18:57:07 +05:30
parent 555f096b05
commit 22d5d7fe5f
5 changed files with 1004 additions and 2249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -326,27 +326,12 @@
<a class="list-group-item _blank" href="../docs/csv_import/categories_import.csv">
{l s='Sample Categories file'}
</a>
{* <a class="list-group-item _blank" href="../docs/csv_import/combinations_import.csv">
{l s='Sample Combinations file'}
</a> *}
<a class="list-group-item _blank" href="../docs/csv_import/customers_import.csv">
{l s='Sample Customers file'}
</a>
<a class="list-group-item _blank" href="../docs/csv_import/bookings_import.csv">
{l s='Sample Bookings file'}
</a>
{* <a class="list-group-item _blank" href="../docs/csv_import/addresses_import.csv">
{l s='Sample Addresses file'}
</a> *}
{* <a class="list-group-item _blank" href="../docs/csv_import/manufacturers_import.csv">
{l s='Sample Manufacturers file'}
</a> *}
{* <a class="list-group-item _blank" href="../docs/csv_import/suppliers_import.csv">
{l s='Sample Suppliers file'}
</a> *}
{* <a class="list-group-item _blank" href="../docs/csv_import/alias_import.csv">
{l s='Sample Aliases file'}
</a> *}
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item _blank" href="../docs/csv_import/supply_orders_import.csv">
{l s='Sample Supply Orders file'}

32
classes/CsvOrder.php
View File

@@ -1,32 +0,0 @@
<?php
/**
* Copyright since 2010 Webkul.
*
* NOTICE OF LICENSE
*
* All right is reserved,
* Please go through this link for complete license : https://store.webkul.com/license.html
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade QloApps to newer
* versions in the future. If you wish to customize QloApps for your
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
*
* @author Webkul IN <support@webkul.com>
* @copyright since 2010 Webkul IN
* @license https://store.webkul.com/license.html
*/
class CsvOrder extends PaymentModule
{
public $active = 1;
public $name = 'csvorder';
public function __construct()
{
$this->payment_type = OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT;
}
}

6
classes/order/OrderHistory.php
View File

@@ -414,10 +414,8 @@ class OrderHistoryCore extends ObjectModel
return false;
}
if ($order->module != 'csvorder') {
if (!$this->sendEmail($order, $template_vars)) {
return false;
}
if (!$this->sendEmail($order, $template_vars)) {
return false;
}
return true;

3194
controllers/admin/AdminImportController.php
View File

File diff suppressed because it is too large Load Diff

6
docs/csv_import/bookings_import.csv
View File

@@ -1,4 +1,4 @@
Order Reference ID;Customer ID;Room Type ID;Duration(yyyy-mm-dd);Number Of Rooms;Order Price;Due Amount;Currency ID;Order Status ID;Service Product IDs (x, y, z,..);Additional Facilities IDs (x, y, z,...)
1;1;1;2025-03-09,2025-03-10;1;1250;;1;2;20;
1;1;2;2025-03-09,2025-03-10;2;2000;;;2;20;
Order Reference ID;Customer ID;Room Type ID;Duration(yyyy-mm-dd);Number Of Rooms;Order Price;Due Amount;Currency ID;Order Status ID;Service Product IDs (x:n, y:n, z:n,..);Additional Facilities IDs (x:a, y:b, z:c,...)
1;1;1;2025-03-09,2025-03-10;1;1250;;1;2;20:2;2:1
1;1;2;2025-03-09,2025-03-10;2;2000;;;2;20;1
2;2;1;2024-03-09,2024-03-10;2;1250;250;;8;20;
1 Order Reference ID Customer ID Room Type ID Duration(yyyy-mm-dd) Number Of Rooms Order Price Due Amount Currency ID Order Status ID Service Product IDs (x, y, z,..) Service Product IDs (x:n, y:n, z:n,..) Additional Facilities IDs (x, y, z,...) Additional Facilities IDs (x:a, y:b, z:c,...)
2 1 1 1 2025-03-09,2025-03-10 1 1250 1 2 20 20:2 2:1
3 1 1 2 2025-03-09,2025-03-10 2 2000 2 20 20 1
4 2 2 1 2024-03-09,2024-03-10 2 1250 250 8 20 20