Bladeren bron

some fixes

szollosil 1 jaar geleden
bovenliggende
commit
c61dc0714d
2 gewijzigde bestanden met toevoegingen van 3 en 8 verwijderingen
  1. 1 6
      custom/booking/class/booking_agenda_helper.class.php
  2. 2 2
      custom/eventwizard/eventdetails_card.php

+ 1 - 6
custom/booking/class/booking_agenda_helper.class.php

@@ -235,12 +235,9 @@ class BookingAgendaHelper
         $eventsArray = explode(',', $event);
         $everything = [];
         foreach ($eventsArray as $eventdetail) {
-            $sql = "SELECT ac.id, ac.datep, ac.datep2, ac.durationp, bh.fk_facture, bh.invoice_number, pr.label
+            $sql = "SELECT ac.id, ac.datep, ac.datep2, ac.durationp, bh.fk_facture, bh.invoice_number
             FROM llx_actioncomm as ac 
             INNER JOIN llx_booking_bookinghistory as bh ON bh.fk_event = ac.id
-            INNER JOIN llx_eventwizard_eventdetails as ed ON bh.fk_event_detail = ed.rowid
-            INNER JOIN llx_eventwizard_eventproduct as ep ON ep.fk_eventdetails = ed.rowid
-            INNER JOIN llx_product as pr ON pr.rowid = ep.fk_product
             WHERE ac.id = {$eventdetail} ORDER BY fk_facture DESC";
             //print $sql;
             //exit;
@@ -248,14 +245,12 @@ class BookingAgendaHelper
             if ($db->num_rows($result) > 0) {
                 print '<table><thead><tr class="firstcolumn">
                     <th>Facture</th>
-                    <th>Location</th>
                     <th>Time Range</th>
                 </tr></thead><tbody>';
                 $rowcolorCounter = 0;
                 while ($row = $db->fetch_object($result)) {
                     print '<tr class="center" style="height:60px; background-color: ' . $this->getBGColor($rowcolorCounter) . ';">
                         <td class="" style="padding:20px;">' . $row->invoice_number . '</td>
-                        <td style="padding:20px;">' . $row->label . '</td>
                         <td style="padding:20px;">' . $row->datep . ' - ' . $row->datep2 . '</td>
                     </tr>';
                     $rowcolorCounter++;

+ 2 - 2
custom/eventwizard/eventdetails_card.php

@@ -756,8 +756,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					
 					$(document).on("click",".addTime",function(){
 						var elem = $(this);
-						// var html = \'<span class="addedTimes"> & <input type="time" name="Day\'+elem.attr("info")+\'-timestart[]"> - <input type="time" name="Day\'+elem.attr("info")+\'-timeend[]">'.$langs->trans('').'</span>\';
-						var html = \'<span class="addedTimes timeSelectBox"><span class="time_slider" style="display:inline-block;width:150px;"></span><br/><span class="time_slider_details">Kezdés:<input type="time" name="Day\'+elem.attr("info")+\'-timestart[]" info="0" class="timepicker timestart"><br/> Időtartam: <input name="Day\'+elem.attr("info")+\'-time-duration[]" pattern="[0-9]+:[0-9]{2}$" placeholder="hh:mm" type="text" class="durationtime" style="width:45px !important"/><input name="Day\'+elem.attr("info")+\'-timeend[]" class="timeend hide" info="0"/></span></span>.\';
+						// var html = \'<span class="addedTimes"> & <input type="time" name="Day\'+elem.attr("info")+\'-timestart[]"> - <input type="time" name="Day\'+elem.attr("info")+\'-timeend[]">ASD</span>\';
+						var html = \'<span class="addedTimes timeSelectBox"><span class="time_slider" style="display:inline-block;width:150px;"></span><span class="time_slider_details">'.$langs->trans('StartTime').':<input type="time" name="Day\'+elem.attr("info")+\'-timestart[]" info="0" class="timepicker timestart"><br/> '.$langs->trans('Duration').': <input name="Day\'+elem.attr("info")+\'-time-duration[]" pattern="[0-9]+:[0-9]{2}$" placeholder="hh:mm" type="text" class="durationtime" style="width:45px !important"/><input name="Day\'+elem.attr("info")+\'-timeend[]" class="timeend hide" info="0"/></span></span>\';
 						elem.parent().parent().find("td.dayTime").append(html);
 						$(function(){
 							// gen.setTimeRange(".time_slider");