szollosil hai 1 ano
pai
achega
3de47bbbba

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 208 - 183
comm/action/card.php


+ 11 - 0
custom/bbus/class/apiproductlisthelper.class.php

@@ -101,6 +101,7 @@ class ApiProductListHelper
 				if (!$ids_only) {
 					$product_static = new ApiProductListProduct($this->db);
 					if ($product_static->fetch($obj->rowid)) {
+						$product_static->isEvent = $this->checkIsEvent($product_static->array_options['options_basic_service']);
 						if ($includestockdata && DolibarrApiAccess::$user->rights->stock->lire) {
 							$product_static->load_stock();
 
@@ -153,6 +154,16 @@ class ApiProductListHelper
         return $obj_ret;
     }
 
+	private function checkIsEvent($basic_service){
+		$sql = "SELECT is_event FROM llx_bbus_basicservices WHERE rowid = {$basic_service}";
+		$result = $this->db->query($sql);
+		if($this->db->num_rows($result) > 0){
+			while($row = $this->db->fetch_object($result)){
+				return $row->is_event;
+			}
+		}
+		return false;
+	}
 	private function checkAvailableSpaces($product_id){
 		global $conf;
 		$bookingApi = new BookingApi($this->db);

+ 6 - 6
custom/eventwizard/eventdetails_card.php

@@ -591,7 +591,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			<tbody>
 				<tr class="titre">
 					<td class="nobordernopadding valignmiddle col-title">
-						<div class="titre inline-block">'.$langs->trans('Események generálása').'</div>
+						<div class="titre inline-block">'.$langs->trans('GenerateEvents').'</div>
 					</td>
 				</tr>
 			</tbody>
@@ -599,17 +599,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print'<table class="border centpercent tableforfield">
 			<tbody>
 				<tr class="field_label">
-					<td class="titlefield fieldname_label"><span style="padding: 0px; padding-right: 3px !important;">'.$langs->trans('Date Range').'</span><span class="classfortooltip" style="padding: 0px; padding: 0px; padding-right: 3px !important;" title="Help text"><span class="fas fa-info-circle  em088 opacityhigh" style=" vertical-align: middle; cursor: help"></span></span></td>
-					<td class="valuefield fieldname_label wordbreak"><input type="text" id="date-range"><i class="fa fa-calendar" style="margin-left: -15px;"></i></td>
+					<td class="titlefield fieldname_label"><span style="padding: 0px; padding-right: 3px !important;">'.$langs->trans('DateRange').'</span><span class="classfortooltip" style="padding: 0px; padding: 0px; padding-right: 3px !important;" title="' . $langs->trans('DateRangeHelp') . '"><span class="fas fa-info-circle  em088 opacityhigh" style=" vertical-align: middle; cursor: help"></span></span></td>
+					<td style="padding-left:35px;" class="valuefield fieldname_label wordbreak"><input type="text" id="date-range"><i class="fa fa-calendar" style="margin-left: -15px;"></i></td>
 				</tr>';
 		for($i=1;$i<=7;$i++){
 			$key = $i%7;
 			print '<tr class=""><td class="titlefield">'.$langs->trans('Day'.$key).'</td><td class="dayTime" style="height: 20px;"><input type="checkbox" id="Day'.$key.'" style="float:left; margin:15px;">
 					<span class="timeSelectBox">'.
 						// '<span class="time_slider" style="display:inline-block;width:150px;"></span><br/>'.
-						'<span class="time_slider_details" >Kezdés: '.
+						'<span class="time_slider_details" >' . $langs->trans('StartTime') . ': '.
 						'<input type="time" pattern="[0-9]+:[0-9]{2}$" placeholder="hh:mm" name="Day'.$key.'-timestart[]" info="0" class="timestart timepicker">'.
-						'<br/> Időtartam: '.
+						'<br/> ' . $langs->trans('Duration') . ': '.
 						'<input name="Day'.$key.'-time-duration[]" type="text" class="durationtime" pattern="^[0-9]{2}+:[0-9]{2}$" placeholder="hh:mm" style="width:45px !important;"/>'.
 						'<input type="time" name="Day'.$key.'-timeend[]"class="timeend hide" info="0"/>'.
 						'</span>'.
@@ -907,7 +907,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			</tr>
 			</tbody></table>';
 		print '';
-		print '<br/><button style="width:100%;margin: 0em;" class="butAction" id="eventGen">'.$langs->trans('Események generálása').'</button>';
+		print '<br/><button style="width:100%;margin: 0em;" class="butAction" id="eventGen">'.$langs->trans('GenerateEvents').'</button>';
 		
 		print '	</div>
 		</div><hr/>';

+ 6 - 1
custom/eventwizard/langs/en_US/eventwizard.lang

@@ -61,4 +61,9 @@ ListEventLocation = List of event locations
 NewEventDetails = New Event detail
 ListEventDetails = List of event details
 DeparturePoint = Departure point
-ArrivalPoint = Arrival point
+ArrivalPoint = Arrival point
+StartTime = Start time
+Duration = Duration
+GenerateEvents = Generate events
+DateRangeHelp = Select the right daterange
+DateRange = Date range

+ 7 - 2
custom/eventwizard/langs/hu_HU/eventwizard.lang

@@ -44,7 +44,7 @@ EventWizardAboutPage = EventWizard about page
 #
 # Sample page
 #
-EventWizardArea = Home EventWizard
+EventWizardArea = Események listája
 MyPageName = My page name
 
 #
@@ -61,4 +61,9 @@ ListEventLocation = Eseményhelyszínek listája
 NewEventDetails = Új esemény
 ListEventDetails = Események listája
 DeparturePoint = Indulás helyszíne
-ArrivalPoint = Érkezés helyszíne
+ArrivalPoint = Érkezés helyszíne
+StartTime = Kezdés
+Duration = Időtartam
+GenerateEvents = Események generálása
+DateRangeHelp = Válaszd ki a megfelelő dátumtartományt
+DateRange = Dátumtartomány

+ 1 - 1
custom/rollerstorage/class/api_lunatours.class.php

@@ -23,7 +23,7 @@ class LunaToursApi extends DolibarrApi
 
 
 	/**
-	 * check available dates and 
+	 * checkPermission
 	 *
 	 * Return a result.
 	 *

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio