WordPress.org
Get WordPress

Plugin Directory

Changeset 2101227


Ignore:
Timestamp:
06/05/2019 07:59:23 PM (7 years ago)
Author:
ecalypse
Message:

Fixed bug with checking item availability on service book page.

Location:
ecalypse-rental-starter/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ecalypse-rental-starter/trunk/class.ecalypse-rental.php

    r2037009 r2101227  
    21412141
    21422142            $overbooking = get_option('ecalypse_rental_overbooking');
     2143            $sql_having = '';
    21432144            if ($overbooking && $overbooking == 'no') {
    21442145
    … …  
    21632164                                                        FROM `' . EcalypseRental::$db['fleet'] . '` f WHERE f.`id_fleet` = %d AND f.`deleted` IS NULL';
    21642165                //$wpdb->query('SELECT ');
     2166                $sql_having = ' HAVING `rented_cars`  < f.`number_vehicles` ';
    21652167            } else {
    21662168                $sql = 'SELECT f.*, 0 as `booked` FROM `' . EcalypseRental::$db['fleet'] . '` f WHERE f.`id_fleet` = %d AND f.`deleted` IS NULL';
    21672169            }
    21682170
    2169             $vehicle = $wpdb->get_row($wpdb->prepare($sql, $id_fleet));
     2171            $vehicle = $wpdb->get_row($wpdb->prepare($sql.$sql_having, $id_fleet));
    21702172
    21712173            if (DEBUG_MODE) {
    … …  
    21772179            // Prices
    21782180            if ($vehicle && ($vehicle->number_vehicles > $vehicle->booked || ($overbooking && $overbooking == 'yes'))) {
    2179 
     2181               
    21802182                // get additional vehicles
    21812183                $vehicle->additional_vehicles = self::get_vehicles($_GET);
     2184               
    21822185                if ($vehicle->additional_vehicles && isset($vehicle->additional_vehicles['results'])) {
    21832186                    $vehicle->additional_vehicles = $vehicle->additional_vehicles['results'];
    21842187                }
    2185 
    21862188                $vehicle->prices = self::get_prices('fleet', $vehicle->id_fleet, $date_from, $date_to, $promocode, (isset($filters['el']) ? (int) $filters['el'] : false), (isset($filters['rl']) ? (int) $filters['rl'] : false), (isset($filters['dl']) ? true : false), (isset($filters['p']) ? $filters['p'] : false));
    21872189                // Free km

  • ecalypse-rental-starter/trunk/ecalypse-rental-starter.php

    r2089842 r2101227  
    77  Plugin URI: http://ecalypse.com/wordpressecalypse-rental/
    88  Description: Ecalypse Rental Starter enables complete rental management of cars, bikes and other equipment.
    9   Version: 4.0.12
     9  Version: 4.0.13
    1010  Author: Ecalypse s.r.o.
    1111  Author URI: http://ecalypse.com/
    … …  
    7474} else {
    7575
    76     define('ECALYPSERENTALSTARTER_VERSION', '4.0.12');
     76    define('ECALYPSERENTALSTARTER_VERSION', '4.0.13');
    7777    define('ECALYPSERENTALSTARTER__MINIMUM_WP_VERSION', '3.9');
    7878    define('ECALYPSERENTALSTARTER__PLUGIN_URL', plugin_dir_url(__FILE__));
Note: See TracChangeset for help on using the changeset viewer.