Changeset 649393

Timestamp:

01/07/2013 10:41:38 PM (13 years ago)

Author:

lyros

Message:

Update to wp-easybooking 1.0.1

Location:

wp-easybooking/trunk

Files:

• admin/adminSettings.php (modified) (3 diffs)
• admin/bookItNow.php (modified) (1 diff)
• admin/businessCreator.php (modified) (6 diffs)
• admin/businessCreator_mainData.php (modified) (5 diffs)
• admin/businessDeals.php (modified) (1 diff)
• admin/businesses_bookings.php (modified) (2 diffs)
• admin/businesses_list.php (modified) (7 diffs)
• admin/rooms.php (modified) (3 diffs)
• admin/translate.php (modified) (2 diffs)
• classes/calendar.class.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)
• widgets/ajaxProposeLocation.php (modified) (1 diff)
• widgets/ajaxSearchDestinations.php (modified) (5 diffs)
• widgets/booking_page.php (modified) (4 diffs)
• widgets/booking_report.php (modified) (2 diffs)
• widgets/business_data.php (modified) (4 diffs)
• widgets/businesses_list_results.php (modified) (3 diffs)
• widgets/load_booking.php (modified) (1 diff)
• widgets/load_business.php (modified) (7 diffs)
• widgets/search_form.php (modified) (3 diffs)

wp-easybooking/trunk/admin/adminSettings.php

@@ -144 +144 @@
 
     jQuery(document).ready(function() {
-        jQuery("#numberOfBusinesessInDebt").html('<img src="<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/ajax-loader.gif" />');
+        jQuery("#numberOfBusinesessInDebt").html('<img src="<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif" />');
         jQuery("#busNumOwingHidden").val(0);
         var businessIdsStr = jQuery("#businessIDsForBalanceReporter").val();
@@ -151 +151 @@
             var businessIdInside = businessIdsStrArr[i].split(":");
             var bID = businessIdInside[1];
-            ajaxBallanceRep(bID, businessIdInside[2]);
+            //ajaxBallanceRep(bID, businessIdInside[2]);
         }       
     });
@@ -169 +169 @@
     
     
-    function ajaxBallanceRep(bID, bName){
-        <?php $absPath = str_replace('\\','/', ABSPATH);?>
-        jQuery.ajax({
-            type: "POST",
-            url: "../wp-content/plugins/wp_easybooking/classes/siteBilling.class.php",              
-            data: "usrLevel=<?php echo $current_user->wp_user_level; ?>&bID="+bID+"&aPath=<?php echo $absPath; ?>&pref=<?php echo $table_prefix; ?>",
-            success: function(resp){            
-                if(resp.indexOf("color:red") != -1){
-                    jQuery("#businessesInDebtList").html(jQuery("#businessesInDebtList").html() + "<p><a href='admin.php?page=busines_menu&bID="+bID+"&bill=show' title='View details' target='_blank'> <b><em>"+bName+"</em></b> balance is "+resp+"</a></p>");
-                    var intCounter = parseInt( jQuery("#busNumOwingHidden").val() );
-                    intCounter++;
-                    jQuery("#busNumOwingHidden").val(intCounter);
-                    checkHiddenValForNumOfDebtors();
-                }               
-            }
-        });
+    function ajaxBallanceRep(bID, bName){       
+        /*NOT AVAILABLE FOR FREE VERSION*/
     }
     
     function checkHiddenValForNumOfDebtors(){
-        if(jQuery("#busNumOwingHidden").val() > 0){
-            jQuery("#numberOfBusinesessInDebt").html("There are "+jQuery("#busNumOwingHidden").val()+" businesses that have debt.");
-            jQuery("#businessesInDebtListBtn").show();
-            jQuery("#balanceMainContainer").show();
-        }
-        else jQuery("#numberOfBusinesessInDebt").html('No business has any kind of debt');  
+        jQuery("#numberOfBusinesessInDebt").html('No fees (dept) found');   
     }
     

wp-easybooking/trunk/admin/bookItNow.php

@@ -652 +652 @@
             jQuery.ajax({
             type: "POST",
-            url: "../wp-content/plugins/wp_easybooking/classes/booking.class.php",
+            url: "../wp-content/plugins/wp-easybooking/classes/booking.class.php",
             data: "sID="+rID+"&bID="+bID+"&startRange="+jQuery('#eb_dateRangeStart').val()+"&endRange="+jQuery('#eb_dateRangeEnd').val()+"&getServicePrice=WITH_AJAX&abPath="+absPath,
             success: function(resp){  

wp-easybooking/trunk/admin/businessCreator.php

@@ -3 +3 @@
 
 //set up all variables:
+$eb_BusinessPackDeal = '';
+$eb_BusinessPackDealTitle = '';
 $eb_BusinessTitle = '';
 $eb_BusinessDateReg = '';
@@ -400 +402 @@
             }
         }
+        $eb_BusinessPackDeal = get_post_meta($businessId, "eb_packDeal");
+        if(!empty($eb_BusinessPackDeal)) $eb_BusinessPackDeal = $eb_BusinessPackDeal[0]; else $eb_BusinessPackDeal ='';
+        $eb_BusinessPackDealTitle = $wpdb->get_row('select post_title from '.$table_prefix.'posts where ID = '.$eb_BusinessPackDeal);
+        if(!empty($eb_BusinessPackDealTitle)) $eb_BusinessPackDealTitle = $eb_BusinessPackDealTitle->post_title;
+        else $eb_BusinessPackDealTitle = '';
         
         $eb_ServicesDetailsStr= '';
@@ -472 +479 @@
         }
         //=============================================================
+        //=====================PACKAGE DEAL CHANGE=====================
+
+if(isset($_REQUEST['pack']) && $_REQUEST['pack'] != ''){
+    $bID = addslashes($_REQUEST['bID']);
+    $pack = $_REQUEST['pack'];
+    update_post_meta($bID,'eb_packDeal', $pack);    
+}
         
         //=============================================================
@@ -652 +666 @@
         ?>
         </td>
+        <td style="border:none"><span style="padding:5px;color:#ccc">|</span>
+            <label>Package Deal: </label>
+            <select id="selPackageDeal" onchange="setPackageDeal()">
+            <?php
+                $allDeals = $wpdb->get_results('select ID, post_title from '.$table_prefix.'posts where post_type = "eb_chargingDeal"');
+                foreach($allDeals as $deal){            
+                    if($editDealName == $deal->post_title && $did != $deal->ID)
+                        $dealNameExists = true;
+                    echo '<option value="'.$deal->ID.'" ';
+                    if($eb_BusinessPackDeal == $deal->ID){
+                        echo ' selected';
+                        
+                    }
+                    echo '>'.$deal->post_title.'</option>';
+                }
+            ?>
+    </select>
+    </td>
     </tr>
     </table>
@@ -711 +743 @@
                                 <div id="logoUploadArea">
                                 <p id="result"></p>
-                                <p id="f1_upload_process" style="display:none">Loading...<br/><img src="<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/ajax-loader.gif" /></p>
+                                <p id="f1_upload_process" style="display:none">Loading...<br/><img src="<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif" /></p>
                                 <form action="<?php echo WP_CONTENT_URL.'/plugins/'.$ebPluginFolderName; ?>/uploadLogo.php?target=businessLogo&bID=<?php echo $businessId ?>" method="post" enctype="multipart/form-data" target="upload_target" onsubmit="startUpload();" >
                                 
@@ -1023 +1055 @@
                         return true;   
                         }
-                    
+
+function setPackageDeal(){
+    var newDeal = jQuery("#selPackageDeal").val();
+    var url = "<?php echo get_admin_url() .'admin.php?page='.$_REQUEST['page'].'&bID='.$_REQUEST['bID'].'&pack=';?>"+newDeal; 
+    window.location = url;  
+}
+                            
                             
     function IpayFunc(){

wp-easybooking/trunk/admin/businessCreator_mainData.php

@@ -112 +112 @@
             <?php //if($current_user->wp_user_level == 10){?>
             <li><a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+            
             <?php //}?>
             <!--<li><a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
@@ -129 +130 @@
         </div>
 
-<script type="text/javascript" >
+<script type="text/javascript" >    
     function showInfo(infoDivID){
         if(jQuery('#'+infoDivID).css("display") == "none"){
@@ -518 +519 @@
                                 </p>
                                 </div>                              
-                                <div id="seasonLoadingImg" style="width:99%;display:none" align="center"><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/ajax-loader.gif'></div>
+                                <div id="seasonLoadingImg" style="width:99%;display:none" align="center"><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif'></div>
                                 <div id="eb_seasonsArea" style="<?php if($eb_BusinessHasSeasons == '' || $eb_BusinessHasSeasons =='NO' ) echo 'display:none;'; if($eb_BusinessHasSeasons =='YES' ) echo 'display:block;';?>">
                                 <p>
@@ -527 +528 @@
                                                 End : <span id="eb_lowSeasonEndArea"><select name="eb_lowSeasonEnd" id="eb_lowSeasonEnd"><option value="NOT_SET">Set date</option><?php eb_daysList($eb_BusinessLowSeasonEnd);?></select></span>
                                             </div>
-                                            <img src='<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/ajax-loader.gif' style="display:none">
+                                            <img src='<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif' style="display:none">
                                     </div>
                                 </p> 
@@ -939 +940 @@
                                 </div>
                                 
+                                <div id="debtInfoDiv" class="eb_simpleContainer" style="width:900px;display:none;">                                 
+                                    <em>No report available.</em>
+                                </div>
                             </td>
                         </tr>                   

wp-easybooking/trunk/admin/businessDeals.php

@@ +1 @@
+<?php
+global $current_user;
+global $wpdb;
+global $ebPluginFolderName;
+$siteCurrency = get_option('eb_siteCurrency');
+//===========================================================================
+//=======================GET ALL DEALS=======================================
+global $table_prefix;
+$allDeals = $wpdb->get_results('select ID, post_title from '.$table_prefix.'posts where post_type = "eb_chargingDeal"');
+
+if(sizeof($allDeals) == 0){
+    $newDealData = array(
+    'post_author' =>  $current_user->ID,
+    'post_date' => gmdate("Y-m-d H:i:s"),
+    'post_date_gmt' => gmdate("Y-m-d H:i:s"),
+    'post_name' => 'DEFAULT',
+    'post_title' => 'DEFAULT',
+    'post_type' => "eb_chargingDeal"
+    ); 
+    
+    if ($newDealID = wp_insert_post( $newDealData, $wp_error )){                    
+        update_post_meta($newDealID,'eb_dealPersentCost', '0');
+        update_post_meta($newDealID,'eb_defaultPackDeal', $newDealID);
+    }
+
+    $newDealData = array(
+    'post_author' =>  $current_user->ID,
+    'post_date' => gmdate("Y-m-d H:i:s"),
+    'post_date_gmt' => gmdate("Y-m-d H:i:s"),
+    'post_name' => 'BUSINESS-ONE',
+    'post_title' => 'BUSINESS-ONE',
+    'post_type' => "eb_chargingDeal"
+    ); 
+    
+    if ($newDealID = wp_insert_post( $newDealData, $wp_error )){                    
+        update_post_meta($newDealID,'eb_dealPersentCost', '0');     
+    }
+}
+
+if(isset($_REQUEST['action'])){
+    if($_REQUEST['action']== "updated") echo '<div class="updated">Deal updated successfully</div>';
+    if($_REQUEST['action']== "added") echo '<div class="updated">New deal added successfully</div>';
+}
+
+if(isset($_REQUEST['sdef']) && $_REQUEST['sdef'] != ''){
+    $setDefDeal = addslashes($_REQUEST['sdef']);
+    if(is_numeric($setDefDeal)){
+        $wpdb->query('delete from '.$table_prefix.'postmeta where meta_key = "eb_defaultPackDeal"');
+        update_post_meta($setDefDeal,'eb_defaultPackDeal', $setDefDeal);    
+    }   
+}
+//===========================================================================
+//=======================END GET ALL DEALS===================================
+
+
+//===========================================================================
+//=============================EDIT DEAL=====================================
+$dealNameExists = false;
+if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'edit' && $_REQUEST['did'] != ''){
+    $did = $_REQUEST['did'];
+    $editDealName = addslashes($_POST['editDealTitle']);
+    $newDealPeriodCost = addslashes($_POST['editDealPeriodCost']);
+    $newDealPeriodDuration = addslashes($_POST['editDealDuration']);
+    $newDealPersentCost = addslashes($_POST['editDealPercentage']);
+    $hasErrors = false;
+    $errorMessage = '';
+    $warningMessage ='';
+    
+    if($editDealName != ''){
+        foreach($allDeals as $deal){
+            
+            if($editDealName == $deal->post_title && $did != $deal->ID)
+                $dealNameExists = true;
+        }
+        if(!$dealNameExists){
+            $dealValuesUpdates = array();
+            $dealValuesUpdates['ID'] = $did;
+            $dealValuesUpdates['post_author'] = $current_user->ID;
+            $dealValuesUpdates['post_name'] = $editDealName;
+            $dealValuesUpdates['post_title'] = $editDealName;
+            $dealValuesUpdates['post_modified_gmt'] = gmdate("Y-m-d H:i:s");
+    
+            if (wp_update_post( $dealValuesUpdates )){
+                //if($newDealPeriodDuration == 0 && $newDealPeriodCost == '' && $newDealPersentCost == 0) $warningMessage .= '<p><em>The new deal has been added successfully but with no charges. If you want to set charges to this deal press the edit button next to it</em></p>'; 
+                if($newDealPeriodDuration!= '') update_post_meta($did,'eb_dealPeriodDuration', $newDealPeriodDuration);
+                if($newDealPeriodCost!= '') update_post_meta($did,'eb_dealPeriodCost', $newDealPeriodCost);
+                if($newDealPersentCost!= '') update_post_meta($did,'eb_dealPersentCost', $newDealPersentCost);
+            }
+            else {
+                $hasErrors = true;
+                $errorMessage .= '<p><em>This deal could not be updated. Please try again or contact your system developer</em></p>';
+            }           
+        }
+        else{
+            $hasErrors = true;
+            $errorMessage .= '<p><em>The name you entered for this deal already exists. Please try again using a different name</em></p>';
+        }
+    }//end if !=''
+    if($hasErrors) {
+        echo '<div class="error">'.$errorMessage.'</div>';
+    }else{
+    ?>
+        <script type="text/javascript" >
+            var url = "<?php echo get_admin_url() .'admin.php?page='.$_REQUEST['page'].'&action=updated';?>"; 
+            window.location = url;
+        </script>
+    <?php   
+    }   
+
+}
+
+//===========================================================================
+//===========================END EDIT DEAL===================================
+
+
+?>
+<h2>Package Deals</h2>
+<table class="widefat">
+    <thead>
+        <tr>
+            <th colspan="7">
+                <strong>Package Deals</strong> <i>(<?php echo sizeof($allDeals); ?> Packages)</i>
+            </th>
+        </tr>
+        <tr>
+            <th></th><th>Deal Title</th><th>Period Cost</th><th>Period Duration</th><th>Percentage per Booking </th><th title="Make it your default package deal">Default</th><th>Edit</th>
+                
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        $dealCounter = 1;
+        foreach($allDeals as $deal){
+                        
+            $periodDuration = get_post_meta($deal->ID,'eb_dealPeriodDuration');
+            if(empty($periodDuration)) $periodDuration = 0; else $periodDuration = $periodDuration[0];
+            $periodCost = get_post_meta($deal->ID,'eb_dealPeriodCost'); 
+            if(empty($periodCost)) $periodCost = 0; else $periodCost = $periodCost[0];
+            $percent = get_post_meta($deal->ID,'eb_dealPersentCost');
+            if(empty($percent)) $percent = 0; else $percent = $percent[0];
+            echo '<form method="post" action="admin.php?page='.$_REQUEST['page'].'&action=edit&did='.$deal->ID.'">';
+            echo '<tr>';
+            echo '<td>'.$dealCounter.'</td>';
+            echo '<td><input type="text" name="editDealTitle" value="'.$deal->post_title.'"></td>';
+            //echo '<td><input type="text" name="editDealPeriodCost" value="'.$periodCost.'" style="width:50px;" onkeypress="return priceNumbersOnlyForDeals(event)"> '.$siteCurrency.'</td>';
+            echo '<td><b>'.$periodCost.' '.$siteCurrency.'</b></td>';
+            echo '<td>';            
+                echo '<b>'.$periodDuration.'</b> months';
+            echo '</td>';
+            echo '<td>';
+                echo '<b>'.$percent.'%</b>';
+            echo '</td>';
+            $defaultPackDeal = get_post_meta($deal->ID,'eb_defaultPackDeal');
+            if(empty($defaultPackDeal)) $defaultPackDeal = ''; else $defaultPackDeal = $defaultPackDeal[0];
+            $checkDefault = '';
+            if($defaultPackDeal != '' && $defaultPackDeal == $deal->ID) $checkDefault = 'checked';
+            echo '<td title="Make '.$deal->post_title.' your default deal. It will be used when a new business is created."><input type="checkbox" onclick="setDefaultDeal('.$deal->ID.')" '.$checkDefault.' /></td>';
+            echo '<td><input type="submit" value="Save changes"></td>';
+            echo '</tr>';
+            echo '</form>';
+            $dealCounter++;
+        }
+            
+        ?>
+    </tbody>
+</table>
+<script type="text/javascript" >
+function setDefaultDeal(dealID){
+    document.location= "admin.php?page=busines_deals&sdef="+dealID;
+};
+
+function priceNumbersOnlyForDeals(evt){
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode == 46 ) return true;//teleia
+    if (charCode == 44 ) return true;//comma
+   if (charCode > 31 && (charCode < 48 || charCode > 57))
+    return false;
+
+   return true;
+}
+
+</script>

wp-easybooking/trunk/admin/businesses_bookings.php

@@ -166 +166 @@
 init_plugin_name();
 function init_plugin_name(){
-  wp_enqueue_script('flotscript', WP_PLUGIN_URL . '/wp_easybooking/js/jquery.flot.min.js', array('jquery'));
-  wp_enqueue_script('excanvasscript', WP_PLUGIN_URL . '/wp_easybooking/js/excanvas.min.js', array('jquery'));
+  wp_enqueue_script('flotscript', WP_PLUGIN_URL . '/wp-easybooking/js/jquery.flot.min.js', array('jquery'));
+  wp_enqueue_script('excanvasscript', WP_PLUGIN_URL . '/wp-easybooking/js/excanvas.min.js', array('jquery'));
 
 }
@@ -189 +189 @@
 function getBAvailability(bID, bTitle, addMonths){
         jQuery("#chartBusinessTitle").html(bTitle);
-        jQuery("#businessAvailabilityDiv").html("<div style='width:100%' align='center'><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/loaderMedium.gif'></div>");
+        jQuery("#businessAvailabilityDiv").html("<div style='width:100%' align='center'><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/loaderMedium.gif'></div>");
         jQuery.ajax({
             type: "POST",
-            url: "../wp-content/plugins/wp_easybooking/classes/businessAvailability.class.php",             
+            url: "../wp-content/plugins/wp-easybooking/classes/businessAvailability.class.php",             
             data: "usrLevel=<?php echo $current_user->wp_user_level; ?>&bID="+bID+"&bTitle="+bTitle+"&aPath=<?php echo $absPath; ?>&pref=<?php echo $table_prefix; ?>&sMonth="+addMonths,       
             success: function(resp){

wp-easybooking/trunk/admin/businesses_list.php

@@ -44 +44 @@
         If there is any content in that business you can view it by pressing on the "View" button at this column. You can also insert some content by pressing on the "Add" button.</p>
         <p>If there is any booking Pending you can see it in the next column of the list, which also shows the total number of bookings made from this website.</p>
-
+        <p>The last column shows the balance of the business. If the business owes to the website, the amount will be coloured with red, and by pressing the button "Balance details" you will be redirected to the "Billing history" tab of the business.</p>
         <p></p>
         <p>If the list is to long, you can select to view business by their type (eg. Hotels only) or if you have the Privileges by owner, from the selection boxes on top of the list.</p>
@@ -176 +176 @@
         echo '<div id="message" class="success"><p><strong>Business deleted successfully</strong></p></div>';
     else echo '<div id="message" class="error"><p><strong>The business you are trying to delete does not exist...</strong></p></div>';
-    //echo ABSPATH.'wp-content/plugins/wp_easybooking/images/businessImg/<br>molis olokklhrw8oun ta rooms, rentals k cruises prepei na diagrafomtai k ayta me tis eikones tous';
 }
 
@@ -318 +317 @@
         <th>Content</th>
         <th>Bookings</th>
-
+        <th>Balance</th>
     </tr>
 </thead>
@@ -351 +350 @@
         <th>Content</th>
         <th>Bookings</th>
+         <th>Balance</th>
     </tr>
 </tfoot>
@@ -392 +392 @@
 if(!empty($businesses)){
     $busCount = $eb_listLimit*($p->page - 1) + 1;
+    $businessIDsForBalanceReporter = '';
     foreach($businesses as $business){
         $owner = $wpdb->get_row('select ID, user_login, user_email from '.$table_prefix.'users where ID = '.$business->post_author);
         if(!empty($owner)){
             $bBookings = $wpdb->get_var("SELECT COUNT(bookingID) from eb_bookingdata where businessID =". $business->ID); 
+            $businessIDsForBalanceReporter .= "|".$business->ID;
             $bBookingsPending = $wpdb->get_var("SELECT COUNT(bookingID) from eb_bookingdata where businessID =". $business->ID.' and booking_status = "Pending"');
                         
@@ -483 +485 @@
             echo '<td>'.$serviceStr.'</td>';
             echo '<td>'.$bookStr.'</td>';
+            echo '<td><em>No report available</em></td>';
             echo '</tr>';
             $busCount++;
         }else echo 'There seems that business '.$business->post_title. ' exists with no owner. You might need to check it out';
     }
+    echo '<input type= "hidden" id="businessIDsForBalanceReporter" value="'.$businessIDsForBalanceReporter.'">';
 }
 
@@ -513 +517 @@
 
 <script type="text/javascript" >
+jQuery(".balanceReporterDiv").html('<img src="<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif" />');
+jQuery(document).ready(function(){
+    
+});
+
 function fetchType(){
     var b_type = jQuery("#select_busType").val();

wp-easybooking/trunk/admin/rooms.php

@@ -302 +302 @@
                                 <div id="logoUploadArea">
                                 <p id="result"></p>
-                                <p id="f1_upload_process" style="display:none">Loading...<br/><img src="<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/ajax-loader.gif" /></p>
+                                <p id="f1_upload_process" style="display:none">Loading...<br/><img src="<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/ajax-loader.gif" /></p>
 <!-- bID is in this page the room id. we use the same function thats why we use the same variables-->
                                 <?php
@@ -905 +905 @@
     function getAvailability(addMonths){
                 
-        jQuery("#availabilitySect").html("<div style='width:100%' align='center'><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp_easybooking/images/loaderMedium.gif'></div>").show();
+        jQuery("#availabilitySect").html("<div style='width:100%' align='center'><img src='<?php echo WP_CONTENT_URL;?>/plugins/wp-easybooking/images/loaderMedium.gif'></div>").show();
         if(!addMonths) addMonths = 0;
         <?php 
@@ -915 +915 @@
         jQuery.ajax({
             type: "POST",
-            url: "../wp-content/plugins/wp_easybooking/classes/roomAvailability.class.php",             
+            url: "../wp-content/plugins/wp-easybooking/classes/roomAvailability.class.php",             
             data: "sID=<?php echo $_REQUEST['rID']; ?>&sMonth="+addMonths+"&aPath="+abspath+"&pref=<?php echo $table_prefix; ?>",
             success: function(resp){

wp-easybooking/trunk/admin/translate.php

@@ -13 +13 @@
         ?>';
         
-        $transFile = ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/'.$fname.'.trans.php';
+        $transFile = ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/'.$fname.'.trans.php';
         if (file_exists($transFile)) {
             global $q_config;
@@ -77 +77 @@
 
 function transFrontEnd($filename, $title){
-    $transFile = ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/'.$filename.'.trans.php';
+    $transFile = ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/'.$filename.'.trans.php';
     if (file_exists($transFile)) {
         global $q_config;

wp-easybooking/trunk/classes/calendar.class.php

@@ -1 +1 @@
 <?php
 if(isset($_POST['addMonths']) && isset($_POST['ABSPATH']) && isset($_POST['pluginFolderName'])){
-    include_once($_POST['ABSPATH'].'wp-content/plugins/wp_easybooking/classes/calendar.class.php');
+    include_once($_POST['ABSPATH'].'wp-content/plugins/wp-easybooking/classes/calendar.class.php');
     $calendar = new bookingCalendar;
     $curMonth = 0;
@@ -273 +273 @@
         jQuery.ajax({
             type: "POST",
-            url: "../wp-content/plugins/wp_easybooking/classes/calendar.class.php",
-            data: "addMonths=&ABSPATH="+absolutePath+"&pluginFolderName=wp_easybooking&monthCounter=<?php echo $monthCounter;?>&defineRange="+defineRange+"&startRange="+jQuery('#eb_dateRangeStart').val()+"&endRange="+jQuery('#eb_dateRangeEnd').val()+"&startOperatingPeriod="+jQuery('#startOperatingPeriod').val()+"&endOperatingPeriod="+jQuery('#endOperatingPeriod').val(),
+            url: "../wp-content/plugins/wp-easybooking/classes/calendar.class.php",
+            data: "addMonths=&ABSPATH="+absolutePath+"&pluginFolderName=wp-easybooking&monthCounter=<?php echo $monthCounter;?>&defineRange="+defineRange+"&startRange="+jQuery('#eb_dateRangeStart').val()+"&endRange="+jQuery('#eb_dateRangeEnd').val()+"&startOperatingPeriod="+jQuery('#startOperatingPeriod').val()+"&endOperatingPeriod="+jQuery('#endOperatingPeriod').val(),
             success: function(resp){  
                 //alert('yoo: '+resp);              

wp-easybooking/trunk/readme.txt

@@ -1 @@
-===wp_easybooking===
+===wp-easybooking===
 Contributors: Panos Lyrakis
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L8SHL3M7CYVCJ
-Tags: booking, reservation, hotel, multihotel, multilingual, billing management
+Tags: booking, reservation, hotel, multihotel, multilingual, billing management, multi hotel
 Requires at least: 3.4
 Tested up to: 3.5
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-wp_easybooking plugin adds hotel and booking management features.
+wp-easybooking plugin adds multiple-hotel and booking management features.
 
 == Description ==
 
-The **wp_easybooking** plugin gives you the ability to create and manage hotels, hotel owners and bookings. 
+The **wp-easybooking** plugin gives you the ability to create and manage multiple hotels, hotel owners and bookings. 
 
-It supports any language with the help of the free qTranslate plugin. Also provides an area at the administration area so you can translate every message of the widget, for each language enabled. No .po files, and no .mo files, so no need for Poedit...  
+It supports any language with the help of the free qTranslate plugin. Also provides an area at the administration panel so you can translate every message of the widget, for each language enabled. No .po files, and no .mo files, so no need for Poedit...  
 
 Gets currencies rates from the European Central Bank and converts all prices automatically. 
 
-The wp_easybooking widget is included so users may search for hotels and make their bookings. The search form includes an ajax pop up window with suggestions of Cities, Countries or Hotels that match the search term.
+The wp-easybooking widget is included so users may search for hotels and make their bookings. The search form includes an ajax pop up window with suggestions of Cities, Countries or Hotels that match the search term.
 
 Users that have completed a booking receive a 4 digit PIN by email so that they may view their booking on-line.
@@ -59 +59 @@
 == Installation ==
 
-1. Unzip the file you downloaded (wp_easybooking).
-2. Upload the 'wp_easybooking' folder to the '/wp-content/plugins/' directory. 
+1. Unzip the file you downloaded (wp-easybooking.1.0.1.zip).
+2. Upload the 'wp-easybooking' folder to the '/wp-content/plugins/' directory. 
 3. Activate the 'Easy Booking' plugin through the 'Plugins' menu in WordPress.
 4. Activate the 'Easy Booking Widget' widget through the 'Plugins' menu in WordPress.
 
 *Please make sure that you first activate the plugin and then activate the widget.*
+
+You can find more information here <http://wp-easybooking.com/content/6-install-plugin>, and instructions on how to set up the plugin here <http://wp-easybooking.com/content/7-settings>. You can also read this information at the instructions.pdf file.
+
 
 == Screenshots ==
@@ -80 +83 @@
 == Frequently Asked Questions ==
 = I can't add new cities from the quick add form, located at the business's (Hotel's) page =
-To enable this feature you have to install the qTranslate plugin, it's one of the best translation plugins and it's free. The qTranslate plugin should be installed in order the wp_easybooking plugin to function properly.
+To enable this feature you have to install the qTranslate plugin, it's one of the best translation plugins and it's free. The qTranslate plugin should be installed in order the wp-easybooking plugin to function properly.
+
+= Is it necessary to install the qTranslate plugin, even if my site is not multilingual? =
+Yes it is. The wp-easybooking plugin uses qTranslate's functions in several cases, so if you do not install it the plugin will have errors. 
+If your site is not multilingual, you still have to install and activate qTranslate, but don't enable the 'qTranslate language chooser' widget at Appearance/Widgets.
+
+= Can I use a different plugin for translations, or I have to use qTranslate only? =
+The wp-easybooking plugin uses functions of qTranslate for translations. So no other translation plugin will do, only qTranslate.
 
 = I can not select any owner for my hotel =
@@ -92 +102 @@
 4. You have to publish the hotel by pressing the 'Publish' button at the top of the business's page.
 
+= When I search for hotels, there are no rooms and no prices shown at the results page (nor the hotels page), just plain hotel names, even if I have added rooms and prices for them. =
+This may happen for two reasons. First, you have not set the website's currency from the 'Easy Booking' menu. Second, you have not selected a business pack/ package deal for your hotels.
+At the top of the hotel's page there is a selection box with the available business packages options, from which you have to select one. For the free version it doesn't matter which one you select.
+
+= When I activate the plugin and widget, there are several pages added at the menu bar. But when I click on them nothing appears. =
+The plugin creates these several pages in order to use them for displaying specific content. 
+In the instructions.pdf (or at <http://wp-easybooking.com>) you will see that you have to create a new menu (from Appearance/ Menus), and add only the specific pages or post you want, excluding the pages the plugin created.
+In some themes, these pages will still be visible at the menu bar. In that case you have to install a plugin to exclude pages from the manu bar. There are several free plugins to do that.
+
+= When activating the widget, the text in the buttons and labels of the search form appears in many languages, and it is not readable. =
+This is because the plugin comes with some translations. This will be fixed once you install the qTranslate plugin.
+
+= Why do I see 'No report available' at the Balance column at the Businesses List? =
+The free version does not calculate the fee that Hotel Owners owe you. That's why it can not display any report.
+
+= Since the free version does not calculate Hotel Owner's fees, why do I have to select a 'Package Deal' for every hotel? =
+The main (premium) version of this plugin, uses the package deal of the hotel at several procedures. 
+The free version is just limited at the reports, but the calculations are the same. That's why you have to select a Package Deal for each hotel.
+
+= Can I add new Package Deals? =
+No. This operation has been excluded from the free version.
+
+= How can I change the text 'Resort Search Results', that appears at the top of the results page? =
+From the 'Pages' menu of WordPress, select the 'Resort Search Results' page and change it's title to whatever you like. 
+Same goes for the rest of the pages. 
+Be careful though and leave the content as is, change only the titles.
+
+= How can I add a new language? =
+From the qTranslate settings.
+
+= How can I translate the messages of the widget to a language I added, or change the translations that already exist? =
+From the 'Translations' menu of the Easy Booking plugin. All messages are categorised depending on the page they appear. 
+So press on 'Search Form' to translate the messages that appear on the search form, at every language, 'Search Results Page' for messages that appear on the results page etc...  
+
+= Are there any other plugins that extend this plugin's functionality? =
+There are some planned to be ready within the next few months (Rating, Hotels offers etc.), but they will not be free. They will be announced at <http://wp-easybooking.com>.
+
+= How can I change the colours and the way the pages are displayed? =
+Most of the colours can be changed from the 'eb_widgetStyle.css' file, but you have to be familiar with css. 
+There will be support packs, with low costs, available soon at <http://wp-easybooking.com>, which you can purchase. 
+If you do not find any pack that fits your needs I would be more than happy if you contact me at [email protected].
+
+= How can I get any help if I face any problem? =
+Visit <http://wp-easybooking.com> for complete documentation. If you still have any problems or need extra functionality please contact me at [email protected]. 
+
+
 == Changelog ==
 
-= 1.0 =
+= 1.0.1 =
+*Base plugin dir changed to wp-easybooking (from wp_easybooking)
+*Enabled selection of default packages, in order the prices of rooms to be calculated correctly from the widget. 
+
+= 1.0.0 =
 * Fixed search result links to include date ranges and number of guests. 
 * Added google map feature.

wp-easybooking/trunk/widgets/ajaxProposeLocation.php

@@ -15 +15 @@
     include_once($aPath.'wp-load.php');
     include_once($aPath.'wp-includes/wp-db.php');
-    if( !include_once($aPath.'wp-content/plugins/wp_easybooking/widgets/trans-vars/search_form.trans.php') ) echo '';
+    if( !include_once($aPath.'wp-content/plugins/wp-easybooking/widgets/trans-vars/search_form.trans.php') ) echo '';
     ?>
     <div class="general-title"><span class="location-suggestions"><strong><?php echo getLanguageTitle( $eb_lang_Suggestions, $lang, $defaultLang);?></strong></span>

wp-easybooking/trunk/widgets/ajaxSearchDestinations.php

@@ -102 +102 @@
     function __construct($locationTypeVal, $locationIDVal, $locationVal, $hasDatesVal, $fromVal, $toVal, $adultsNumVal, $childrenNumVal, $babiesNumVal, $table_prefixVal, $langVal, $defaultLangVal, $cur, $aPath, $rpage, $orderby, $ordertype){
         $this->limit = 10;
-        include_once($aPath.'wp-content/plugins/wp_easybooking/widgets/trans-vars/search_results.trans.php');
+        include_once($aPath.'wp-content/plugins/wp-easybooking/widgets/trans-vars/search_results.trans.php');
         
         $this->curPage = $rpage;        
@@ -424 +424 @@
                     $resortPageID = get_option('eb-view-resort');
                     if($businessLogo[0] != ''){
-                        /*$resortReport .= '
-                            <div class="eb_column_img"><a class="thickbox" title=';
-                                $resortReport .= '"'.__( $result->post_title ).'"'; 
-                            $resortReport .= ' style="padding-right:10px;" href="'. WP_CONTENT_URL .'/plugins/wp_easybooking/images/businessImg/'. $businessLogo[0].'"><img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/businessImg/thumbs/'.$businessLogo[0].'" /></a></div>
-                            ';*/ 
+
                     } 
 
@@ -445 +441 @@
                                     //$resortReport .= '<a href="'.$permalink.'&t='.$seoTitle.'&eb=resort&b='.$result->ID.$extendedURL.'" title="'.__($result->post_title).'">'.__($result->post_title).'</a>';
                                     $resortReport .= '<a class="link-button" onclick="goToResortPage(\''.$permalink.'&t='.$seoTitle.'&b='.$result->ID.$extendedURL.'\')" title="'.__($result->post_title).'">'.__($result->post_title).'</a>';
-                                    $resortReport .= ' <img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" />';
+                                    $resortReport .= ' <img src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" />';
                                 $resortReport .= '</h1>';
                             
@@ -466 +462 @@
                                 
                                 $resortReport .= '<div style="width:600px;margin-top:0px;"> ';  
-                                $resortReport .= '<a style="float:left;padding-right:10px;" class="link-button" title="'.__( $result->post_title ).'" onclick="goToResortPage(\''.$permalink.'&t='.$seoTitle.'&b='.$result->ID.$extendedURL.'\')"><img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/businessImg/thumbs/'.$businessLogo[0].'" /></a>';
+                                $resortReport .= '<a style="float:left;padding-right:10px;" class="link-button" title="'.__( $result->post_title ).'" onclick="goToResortPage(\''.$permalink.'&t='.$seoTitle.'&b='.$result->ID.$extendedURL.'\')"><img src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/businessImg/thumbs/'.$businessLogo[0].'" /></a>';
                                 $resortReport .= '<span class="resort-description-at-results-page">'.substr( strip_tags( $this->getLanguageTitle( $result->post_content, $this->lang, $this->defaultLang) ), 0, 200).' <a class="more-link" onclick="goToResortPage(\''.$permalink.'&t='.$seoTitle.'&b='.$result->ID.$extendedURL.'\')"><em style="font-size:10px">'.$this->getLanguageTitle( $this->lang_More, $this->lang, $this->defaultLang).'</em></a></span>';
                                 //$resortReport .= '<p><a onclick="goToResortPage(\''.$permalink.'&t='.$seoTitle.'&b='.$result->ID.$extendedURL.'\')" class="eb-search-button little">'.__( 'Book now' ) .'</a></p>';
@@ -583 +579 @@
                         }
                     }
-
-                    if( ( !empty($this->adults) && $adultsInRoom >= min($this->adults)) && ( !empty($this->children) && $childrenInRoom >= min($this->children)) && $childrenInRoom >= min($this->babies)){
+                    $localMinAdults = 1;
+                    $localMinChildren = 0;
+                    $localMinBabies = 0;
+                    if( $this->adults ) $localMinAdults = min($this->adults);
+                    if( $this->children ) $localMinChildren = min($this->children);
+                    if( $this->babies ) $localMinBabies = min($this->babies);
+                    
+                    if( $adultsInRoom >= $localMinAdults && $childrenInRoom >= $localMinChildren && $childrenInRoom >= $localMinBabies){
                     $roomPrice = '-';
                     if( $this->hasDates != 'no' && $switch != 'ROOMCOUNTONLY' ) $roomPrice = $this->roomPrice( $bID, $roomType->ID, $fromDate, $toDate );

wp-easybooking/trunk/widgets/booking_page.php

@@ -17 +17 @@
     $bcur = $wpdb->get_row('select meta_value from '.$table_prefix.'postmeta where post_id = '.$bID.' and meta_key = "eb_currency"');
     $bcur = $bcur->meta_value;
-        
+    
+    if( $ccur == htlcur ){
+        $ccur = $bcur;
+    }
+    
     $lang = 'en';
     //if( isset( $_REQUEST['lang'] ) && $_REQUEST['lang'] != '' ) $lang = addslashes( $_REQUEST['lang'] );
@@ -31 +35 @@
     ?>
     <form action="<?php echo $permalink; ?>lang=<?php echo $lang; ?>" method="post" onsubmit="return checkBookingData();">
+    <!--<form action="<?php echo $permalink; ?>lang=<?php echo $lang; ?>" method="post" onsubmit="alert('Sorry friend, bookings not allowed in Demo version!!');return false;">-->
     <?php   
     $roomsSelected = 0; 
     
-    include_once(ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/booking.trans.php');
+    include_once(ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/booking.trans.php');
     
     $interval = date_diff(date_create( $from ), date_create( $to ) );
@@ -174 +179 @@
         <div class="general-title"><?php _e($eb_lang_BookingDetails);?></div>
         <div>
-            <div class="resort-image-title" style="background-image:url(<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/<?php echo $businessLogo[0];?>)">
+            <div class="resort-image-title" style="background-image:url(<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/businessImg/<?php echo $businessLogo[0];?>)">
                 <div class="resort-title"></div>
             </div>
             <div style="float:left;padding-left:10px;color: #48f;">
-                <strong><?php echo $businessData->post_title.' <img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" />'; ?></strong>
+                <strong><?php echo $businessData->post_title.' <img src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" />'; ?></strong>
                 <div style="font-size:12px;">
                     <?php _e( $address. ' '. $addressNumber );?><br />
@@ -317 +322 @@
     <div class="room-price-area" style="clear:both;">
         <input type="checkbox" id="terms-checkbox" onchange="activateCompleteBooking();" />
-        <span><label for="terms-checkbox"><?php _e( $eb_lang_ReadThe ); ?></label> <a onclick="showTerms();"><?php _e( $eb_lang_TermsAndConditions ); ?></a> <label for="terms-checkbox"><?php _e( $eb_lang_AndIAgree ); ?>.</label></span>
+        <span><label for="terms-checkbox"><?php _e( $eb_lang_ReadThe ); ?> <a onclick="showTerms();"><?php _e( $eb_lang_TermsAndConditions ); ?></a> <?php _e( $eb_lang_AndIAgree ); ?>.</label></span>
     </div>
     <div id="terms-area" class="terms-area">

wp-easybooking/trunk/widgets/booking_report.php

@@ -70 +70 @@
         <input name="return" type="hidden" value="<?php echo stripslashes($return_url); ?>" />
         <input name="cancel_return" type="hidden" value="<?php echo stripslashes($cancel_url); ?>" />
-        <input name="notify_url" type="hidden" value="<?php echo $siteURL; ?>/wp-content/plugins/wp_easybooking/widgets/paypal_functions.php" />
+        <input name="notify_url" type="hidden" value="<?php echo $siteURL; ?>/wp-content/plugins/wp-easybooking/widgets/paypal_functions.php" />
         <!--<input name="notify_url" type="hidden" value="<?php echo stripslashes($return_url); ?>" />-->
         <!--return with post-->
@@ -89 +89 @@
         $bookID = makeBooking( $pin );
 
-        include_once(ABSPATH.'wp-content/plugins/wp_easybooking/widgets/load_booking.php');
+        include_once(ABSPATH.'wp-content/plugins/wp-easybooking/widgets/load_booking.php');
         
         $page_id = get_option('eb-view-bookings');

wp-easybooking/trunk/widgets/business_data.php

@@ -100 +100 @@
     function rooms(){
         global $wpdb;
-        include(ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/resort.trans.php');
+        include(ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/resort.trans.php');
         $resortPageID = get_option('eb-view-resort');
         
@@ -168 +168 @@
                 if( $roomImagesAr[$ic] != ''){
                     $roomImages .= '<span style="padding:2px;">
-                                        <a class="thickbox" href="'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/RoomImg/'.$roomImagesAr[$ic].'">
-                                            <img class="room-img-item" width="100px;" style="overflow: auto;" src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/RoomImg/thumbs/'.$roomImagesAr[$ic].'">
+                                        <a class="thickbox" href="'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/RoomImg/'.$roomImagesAr[$ic].'">
+                                            <img class="room-img-item" width="100px;" style="overflow: auto;" src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/RoomImg/thumbs/'.$roomImagesAr[$ic].'">
                                         </a>
                                     </span>';
@@ -186 +186 @@
                 foreach( $f as $facility ){
                     $roomFacilities .= '<a style="padding: 5px;" title ="'.$facility->facility_description.'">';
-                        if( $facility->image!= '' ) $roomFacilities .= '<img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/icons/'.$facility->image.'" />'; 
+                        if( $facility->image!= '' ) $roomFacilities .= '<img src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/icons/'.$facility->image.'" />'; 
                     $roomFacilities .= $facility->facility_name.'</a>';
                 }
@@ -197 +197 @@
                     $resp .= '<td  valign="top" style="border:none;padding-left:10px;">
                                 <a class="room-details-btn" onclick = "showRoomDetails('.$room->ID.')" title="'.__($room->post_title).'">
-                                    <div class="room-title-area" style="background-image:url('.WP_CONTENT_URL.'/plugins/wp_easybooking/images/RoomImg/thumbs/'.$roomLogo[0].')">
+                                    <div class="room-title-area" style="background-image:url('.WP_CONTENT_URL.'/plugins/wp-easybooking/images/RoomImg/thumbs/'.$roomLogo[0].')">
                                         <strong style="color:#fff">'.__($room->post_title).'</strong> <span class="room-details-label">'.__( $eb_lang_Details ).'</span>
                                     </div>

wp-easybooking/trunk/widgets/businesses_list_results.php

@@ -1 +1 @@
 <a id="eb-results-top-point"></a>
 <?php
-include_once( ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/search_results.trans.php' );
+include_once( ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/search_results.trans.php' );
 global $table_prefix;
 global $eb_path;
@@ -17 +17 @@
 $locationID = addslashes( $_POST['lid'] );
 
-$pluginfolder = get_bloginfo('url') . '/' . PLUGINDIR . '/wp_easybooking/';
+$pluginfolder = get_bloginfo('url') . '/' . PLUGINDIR . '/wp-easybooking/';
 $result_page_ID = get_option('eb-location-result-page');
 
@@ -138 +138 @@
 ?>
 <div id="loading_while_searcing" style="width:100%" align="center">
-    <img src="<?php echo WP_CONTENT_URL . '/plugins/wp_easybooking/images/widget-loader.gif'; ?>" alt="Loading" >
+    <img src="<?php echo WP_CONTENT_URL . '/plugins/wp-easybooking/images/widget-loader.gif'; ?>" alt="Loading" >
     <br />
     <?php _e('Please wait while searching', 'easybooking')?>

wp-easybooking/trunk/widgets/load_booking.php

@@ -396 +396 @@
                         <input name="return" type="hidden" value="<?php echo stripslashes($return_url); ?>" />
                         <input name="cancel_return" type="hidden" value="<?php echo stripslashes($cancel_url); ?>" />
-                        <input name="notify_url" type="hidden" value="<?php echo $siteURL; ?>/wp-content/plugins/wp_easybooking/widgets/paypal_functions.php" />
+                        <input name="notify_url" type="hidden" value="<?php echo $siteURL; ?>/wp-content/plugins/wp-easybooking/widgets/paypal_functions.php" />
                         <!--return with post-->
                         <input type="hidden" name="custom" value="<?php echo $pin; ?>" />

wp-easybooking/trunk/widgets/load_business.php

@@ -5 +5 @@
     global $ebPluginFolderName;
     
-    include_once(ABSPATH.'wp-content/plugins/wp_easybooking/widgets/trans-vars/resort.trans.php');
+    include_once(ABSPATH.'wp-content/plugins/wp-easybooking/widgets/trans-vars/resort.trans.php');
     $location = addslashes( $_POST['location'] );
     $locationType = addslashes( $_POST['type'] );
@@ -72 +72 @@
     $stars = get_post_meta($bID, "eb_stars");
         
-    echo '<h1 class="resort-title"><a>'.$business->post_title.'</a> <img src = "'.WP_CONTENT_URL.'/plugins/wp_easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" /></h1>';
+    echo '<h1 class="resort-title"><a>'.$business->post_title.'</a> <img src = "'.WP_CONTENT_URL.'/plugins/wp-easybooking/images/stars/'.$stars[0].'star-small.png" height="12px" title="'.$stars[0].' stars" /></h1>';
     _e( '<div class="resort-location-at-results-page">'.$address.' '.$addressNumber.'<br />'.$city.', '.$country.'</div>');
     ?>
@@ -85 +85 @@
                     ?>
                         <div class="mainImageContainer">
-                            <a class="thickbox" title="<?php echo $business->post_title; ?>" style="padding-right:10px;" href="<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/<?php echo $businessLogo[0]; ?>">
-                                <div class="business-mains-logo-area" style="background-image:url('<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/thumbs/<?php echo $businessLogo[0]; ?>')">
+                            <a class="thickbox" title="<?php echo $business->post_title; ?>" style="padding-right:10px;" href="<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/businessImg/<?php echo $businessLogo[0]; ?>">
+                                <div class="business-mains-logo-area" style="background-image:url('<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/businessImg/thumbs/<?php echo $businessLogo[0]; ?>')">
                                 </div>
-                                <!--<img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/thumbs/<?php echo $businessLogo[0]; ?>" />-->
                             </a>
                         </div>
@@ -98 +97 @@
                             ?>
                             <div style="float:left;height:40px;border:1px solid #fff;">
-                                <a class="thickbox" title="<?php echo $business->post_title; ?>" style="" href="<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/<?php echo $businessImages[$i]; ?>">
-                                    <img width="70px" src="<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/thumbs/<?php echo $businessImages[$i]; ?>" />
-                                    <!--<div class="business-img-item" style="background-image:url('<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/businessImg/thumbs/<?php echo $businessImages[$i]; ?>')">
-                                </div>-->
+                                <a class="thickbox" title="<?php echo $business->post_title; ?>" style="" href="<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/businessImg/<?php echo $businessImages[$i]; ?>">
+                                    <img width="70px" src="<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/businessImg/thumbs/<?php echo $businessImages[$i]; ?>" />
                                 </a>
                             </div>
@@ -178 +175 @@
                 ?>
                 <div class="resort-data-area" id="resort-data-area-1" style="display:block;">
-                <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e($eb_lang_ResortRooms);?></strong></div>
+                <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e($eb_lang_ResortRooms);?></strong></div>
                 <?php
                 include($eb_folder.'/business_data.php');
@@ -185 +182 @@
                 </div>
                 <div class="resort-data-area" id="resort-data-area-2" style="display:none;">        
-                <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e($eb_lang_ResortMap);?></strong></div>  
+                <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e($eb_lang_ResortMap);?></strong></div>  
                     <iframe width="100%" height="300px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?q=<?php echo $coordinates; ?>(<?php echo $business->post_title; ?>)&amp;ll=<?php echo $coordinates; ?>&amp;num=1&amp;t=h&amp;ie=UTF8&amp;source=embed&amp;z=15&amp;output=embed"></iframe><br /><small><a target="_blank" style="color:#48f;" href="https://maps.google.com/maps?q=<?php echo $coordinates; ?>&amp;num=1&amp;t=h&amp;ie=UTF8&amp;source=embed&amp;z=14" style="color:#0000FF;text-align:left"><div class="general-title" style="width:auto;font-size:12px;"><?php _e( $eb_lang_ViewLargeMap ); ?></div></a></small>
 
                 </div>
                 <div class="resort-data-area" id="resort-data-area-3" style="display:none;">
-                    <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e( $eb_lang_ResortFacilities ); ?></strong></div>
+                    <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e( $eb_lang_ResortFacilities ); ?></strong></div>
                     <div style="font-size:12px;padding:10px;">
                     <?php
@@ -233 +230 @@
                 
                 <div class="resort-data-area" id="resort-data-area-4" style="display:none;width:100%;">
-                    <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e( $eb_lang_ResortPolicies ); ?></strong></div>
+                    <div class="general-title" style="width:auto;font-size:12px;"><strong><img src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/arrow-front-small.png" style="margin-bottom:1px;" height="7px" /> <?php _e( $eb_lang_ResortPolicies ); ?></strong></div>
 
                     <div style="font-size:12px;padding:10px;">

wp-easybooking/trunk/widgets/search_form.php

@@ -139 +139 @@
     <div style="width:100%;text-align:center;">
     <span class="go-to-booking-title" onclick="toggleShowBookingFrm();">
-        <img id="show-hide-arrow" src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/dropdown.png" height="12px" /> <?php _e( $eb_lang_ViewYourBooking ); ?>
+        <img id="show-hide-arrow" src = "<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/dropdown.png" height="12px" /> <?php _e( $eb_lang_ViewYourBooking ); ?>
     </span>
     </div>
@@ -166 +166 @@
     if( jQuery('#go-to-booking').is(':visible') ) {
         jQuery('#go-to-booking').hide('slow');
-        jQuery('#show-hide-arrow').attr('src','<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/dropdown.png');
+        jQuery('#show-hide-arrow').attr('src','<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/dropdown.png');
     }
     else{
         jQuery('#go-to-booking').show('slow');
-        jQuery('#show-hide-arrow').attr('src','<?php echo WP_CONTENT_URL; ?>/plugins/wp_easybooking/images/dropup.png');
+        jQuery('#show-hide-arrow').attr('src','<?php echo WP_CONTENT_URL; ?>/plugins/wp-easybooking/images/dropup.png');
     }
 }
@@ -206 +206 @@
     }
     global $table_prefix;
-    $pluginfolder = get_bloginfo('url') . '/' . PLUGINDIR . '/wp_easybooking/';
+    $pluginfolder = get_bloginfo('url') . '/' . PLUGINDIR . '/wp-easybooking/';
     $result_page_ID = get_option('eb-location-result-page');
     $aPath = str_replace('\\', '/', ABSPATH);