diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 2595e647..157b53ca 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -79,7 +79,7 @@ class EventCheckoutController extends Controller return redirect()->back(); } - return view('Bilettm.ViewEvent.SeatsPage',compact('event','tickets')); + return view('desktop.ViewEvent.SeatsPage',compact('event','tickets')); } /** * Validate a ticket request. If successful reserve the tickets and redirect to checkout @@ -478,7 +478,7 @@ class EventCheckoutController extends Controller } // return view('Public.ViewEvent.EventPageCheckout', $data); - return view('Bilettm.ViewEvent.CheckoutPage', $data); + return view('desktop.ViewEvent.CheckoutPage', $data); } /** @@ -542,7 +542,7 @@ class EventCheckoutController extends Controller 'amount' => $orderService->getGrandTotal()*100,//multiply by 100 to obtain tenge 'currency' => 934, 'sessionTimeoutSecs' => $secondsToExpire, - 'description' => 'Bilettm sargyt: ' . $request->get('order_email'), + 'description' => 'desktop sargyt: ' . $request->get('order_email'), 'orderNumber' => uniqid(), 'failUrl' => route('showEventCheckoutPaymentReturn', [ @@ -640,11 +640,11 @@ class EventCheckoutController extends Controller public function mobileCheckoutPaymentReturn(Request $request, $event_id){ if ($request->get('is_payment_cancelled') == '1') { - return view('Bilettm.Mobile.CheckoutFailed',['message'=>'Toleg besedildi']); + return view('mobile.CheckoutFailed',['message'=>'Toleg besedildi']); } if(!$request->has('orderId')){ - return view('Bilettm.Mobile.CheckoutFailed',['message'=>'order id yok']); + return view('mobile.CheckoutFailed',['message'=>'order id yok']); } $response = $this->gateway->getPaymentStatus($request->get('orderId')); @@ -652,7 +652,7 @@ class EventCheckoutController extends Controller if ($response->isSuccessfull()) { return $this->mobileCompleteOrder($event_id,$request->get('orderId')); } else { - return view('Bilettm.Mobile.CheckoutFailed',['message'=>$response->errorMessage()]); + return view('mobile.CheckoutFailed',['message'=>$response->errorMessage()]); } } @@ -892,7 +892,7 @@ class EventCheckoutController extends Controller return view('Public.ViewEvent.Embedded.EventPageViewOrder', $data); } - return view('Bilettm.ViewEvent.ViewOrderPage', $data); + return view('desktop.ViewEvent.ViewOrderPage', $data); // return view('Public.ViewEvent.EventPageViewOrder', $data); } @@ -1027,7 +1027,7 @@ class EventCheckoutController extends Controller Log::error($ex); DB::rollBack(); - return view('Bilettm.Mobile.CheckoutFailed', + return view('mobile.CheckoutFailed', ['message' => $ex->getMessage()] ); } @@ -1046,7 +1046,7 @@ class EventCheckoutController extends Controller 'tickets' => $order->event->tickets, 'is_embedded' => $this->is_embedded, ]; - return view('Bilettm.Mobile.CheckoutSuccess', $data); + return view('mobile.CheckoutSuccess', $data); } } diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index 2499bc46..a6222036 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -85,7 +85,7 @@ class EventViewController extends Controller } } - return view('Bilettm.ViewEvent.EventPage', $data); + return view('desktop.ViewEvent.EventPage', $data); } /** diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index a63fcd38..d5c9fcab 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -37,7 +37,7 @@ class PublicController extends Controller $sliders = Slider::where('active',1)->get(); //dd($cinema->events->first()); - return view('Bilettm.Public.HomePage')->with([ + return view('desktop.Public.HomePage')->with([ 'cinema' => $cinema, 'cartoon' => $cartoon, 'musical' => $musical, @@ -66,7 +66,7 @@ class PublicController extends Controller ->get(); - return view("Bilettm.Public.EventsPage")->with($data); + return view("desktop.Public.EventsPage")->with($data); } public function showSubCategoryEvents($cat_id){ @@ -82,7 +82,7 @@ class PublicController extends Controller ->orderBy($order['field'],$order['order']) ->paginate(16); - return view("Bilettm.Public.CategoryEventsPage")->with($data); + return view("desktop.Public.CategoryEventsPage")->with($data); } private function sorts_filters(){ @@ -112,11 +112,12 @@ class PublicController extends Controller ->orWhere('title_tk','like',"%{$query}%") ->paginate(10); - return view('Bilettm.Public.SearchResults') + return view('desktop.Public.SearchResults') ->with([ 'events' => $events, 'query' => $query ]); + } public function postAddEvent(AddEventRequest $request){ @@ -127,7 +128,7 @@ class PublicController extends Controller 'phone' => sanitise($request->get('phone')), 'detail' => sanitise($request->get('detail')) ]); - return view('Bilettm.Public.AddEventResult',compact('addEvent')); + return view('desktop.Public.AddEventResult',compact('addEvent')); } public function subscribe(SubscribeRequest $request){ diff --git a/app/Models/Event.php b/app/Models/Event.php index bc5871c6..501b5b64 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -493,7 +493,6 @@ ICSTemplate; public function scopeOnLive($query, $start_date = null, $end_date = null){ //if date is null carbon creates now date instance //todo what if only end date is null?? - dd($start_date,$end_date); if(!empty($start_date) && !empty($end_date)) { $query->where('start_date','<',$end_date) diff --git a/composer.json b/composer.json index 3e9333b5..b4e3d98a 100755 --- a/composer.json +++ b/composer.json @@ -46,7 +46,8 @@ "backpack/settings": "~2.1", "backpack/pagemanager": "~1.1", "backpack/permissionmanager": "~4.0", - "davejamesmiller/laravel-breadcrumbs": "5.3" + "davejamesmiller/laravel-breadcrumbs": "5.3", + "jenssegers/agent": "^2.6" }, diff --git a/composer.lock b/composer.lock index cad47b7d..6f77bbdd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dd6b89fae3c387484849f512aab37d9b", + "content-hash": "da3d5d1ace32a92a7b2210f162402434", "packages": [ { "name": "almasaeed2010/adminlte", @@ -2610,6 +2610,124 @@ "description": "Highlight PHP code in terminal", "time": "2018-09-29T18:48:56+00:00" }, + { + "name": "jaybizzle/crawler-detect", + "version": "v1.2.92", + "source": { + "type": "git", + "url": "https://github.com/JayBizzle/Crawler-Detect.git", + "reference": "eb167049d7de1e5320138186b9dcb2e5f9df260d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/eb167049d7de1e5320138186b9dcb2e5f9df260d", + "reference": "eb167049d7de1e5320138186b9dcb2e5f9df260d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8|^5.5|^6.5", + "satooshi/php-coveralls": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Jaybizzle\\CrawlerDetect\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Beech", + "email": "m@rkbee.ch", + "role": "Developer" + } + ], + "description": "CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent", + "homepage": "https://github.com/JayBizzle/Crawler-Detect/", + "keywords": [ + "crawler", + "crawler detect", + "crawler detector", + "crawlerdetect", + "php crawler detect" + ], + "time": "2020-02-07T20:28:07+00:00" + }, + { + "name": "jenssegers/agent", + "version": "v2.6.3", + "source": { + "type": "git", + "url": "https://github.com/jenssegers/agent.git", + "reference": "bcb895395e460478e101f41cdab139c48dc721ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jenssegers/agent/zipball/bcb895395e460478e101f41cdab139c48dc721ce", + "reference": "bcb895395e460478e101f41cdab139c48dc721ce", + "shasum": "" + }, + "require": { + "jaybizzle/crawler-detect": "^1.2", + "mobiledetect/mobiledetectlib": "^2.7.6", + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5.0|^6.0|^7.0" + }, + "suggest": { + "illuminate/support": "^4.0|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + }, + "laravel": { + "providers": [ + "Jenssegers\\Agent\\AgentServiceProvider" + ], + "aliases": { + "Agent": "Jenssegers\\Agent\\Facades\\Agent" + } + } + }, + "autoload": { + "psr-4": { + "Jenssegers\\Agent\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jens Segers", + "homepage": "https://jenssegers.com" + } + ], + "description": "Desktop/mobile user agent parser with support for Laravel, based on Mobiledetect", + "homepage": "https://github.com/jenssegers/agent", + "keywords": [ + "Agent", + "browser", + "desktop", + "laravel", + "mobile", + "platform", + "user agent", + "useragent" + ], + "time": "2019-01-19T21:32:55+00:00" + }, { "name": "jenssegers/date", "version": "v3.5.0", @@ -3771,6 +3889,58 @@ ], "time": "2017-07-28T00:33:38+00:00" }, + { + "name": "mobiledetect/mobiledetectlib", + "version": "2.8.34", + "source": { + "type": "git", + "url": "https://github.com/serbanghita/Mobile-Detect.git", + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.35||~5.7" + }, + "type": "library", + "autoload": { + "classmap": [ + "Mobile_Detect.php" + ], + "psr-0": { + "Detection": "namespaced/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Serban Ghita", + "email": "serbanghita@gmail.com", + "homepage": "http://mobiledetect.net", + "role": "Developer" + } + ], + "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.", + "homepage": "https://github.com/serbanghita/Mobile-Detect", + "keywords": [ + "detect mobile devices", + "mobile", + "mobile detect", + "mobile detector", + "php mobile detect" + ], + "time": "2019-09-18T18:44:20+00:00" + }, { "name": "moneyphp/money", "version": "v3.2.1", diff --git a/config/backpack/base.php b/config/backpack/base.php index dcabb582..a1a0ec6b 100644 --- a/config/backpack/base.php +++ b/config/backpack/base.php @@ -12,7 +12,7 @@ return [ */ // Project name. Shown in the breadcrumbs and a few other places. - 'project_name' => 'Bilettm', + 'project_name' => 'desktop', // Menu logos 'logo_lg' => 'Bilettm', diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index 4e892e6d..25be34fa 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -23,7 +23,7 @@ return [ | */ - 'view' => 'Bilettm.Partials.BreadCrumbs', + 'view' => 'desktop.Partials.BreadCrumbs', /* |-------------------------------------------------------------------------- diff --git a/public/assets/javascript/backend.js b/public/assets/javascript/backend.js index 636356d9..ab0b5707 100644 --- a/public/assets/javascript/backend.js +++ b/public/assets/javascript/backend.js @@ -893,7 +893,7 @@ window.Modernizr = (function( window, document, undefined ) { // Safari 2-4 allows the smiley as a value, despite making a slider bool = defaultView.getComputedStyle && defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' && - // Mobile android web browser has false positive, so must + // mobile android web browser has false positive, so must // check the height to see if the widget is actually there. (inputElem.offsetHeight !== 0); @@ -3996,7 +3996,7 @@ feature.formdata = window.FormData !== undefined; var hasProp = !!$.fn.prop; // attr2 uses prop when it can but checks the return type for -// an expected string. this accounts for the case where a form +// an expected string. this accounts for the case where a form // contains inputs with names like "action" or "method"; in those // cases "prop" returns the element $.fn.attr2 = function() { @@ -4370,7 +4370,7 @@ $.fn.ajaxSubmit = function(options) { var CLIENT_TIMEOUT_ABORT = 1; var SERVER_ABORT = 2; - + function getDoc(frame) { /* it looks like contentWindow or contentDocument do not * carry the protocol property in ie8, when running under ssl @@ -4378,9 +4378,9 @@ $.fn.ajaxSubmit = function(options) { * the protocol is know but not on the other two objects. strange? * "Same origin policy" http://en.wikipedia.org/wiki/Same_origin_policy */ - + var doc = null; - + // IE8 cascading access check try { if (frame.contentWindow) { @@ -4520,7 +4520,7 @@ $.fn.ajaxSubmit = function(options) { if (xhr.aborted || callbackProcessed) { return; } - + doc = getDoc(io); if(!doc) { log('cannot access response document'); @@ -6404,15 +6404,15 @@ function log() { })(jQuery); ;/* Support Object.keys in IE8 */ -if(!Object.keys) +if(!Object.keys) { - Object.keys = function(obj) + Object.keys = function(obj) { var keys = []; - for (var i in obj) + for (var i in obj) { - if (obj.hasOwnProperty(i)) + if (obj.hasOwnProperty(i)) { keys.push(i); } @@ -6432,26 +6432,26 @@ $.DateTimePicker = $.DateTimePicker || { { mode: "date", defaultDate: null, - + dateSeparator: "-", timeSeparator: ":", timeMeridiemSeparator: " ", dateTimeSeparator: " ", monthYearSeparator: " ", - + dateTimeFormat: "dd-MM-yyyy HH:mm", dateFormat: "dd-MM-yyyy", timeFormat: "HH:mm", - + maxDate: null, minDate: null, - + maxTime: null, minTime: null, - + maxDateTime: null, minDateTime: null, - + shortDayNames: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], fullDayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], shortMonthNames: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], @@ -6463,12 +6463,12 @@ $.DateTimePicker = $.DateTimePicker || { secondsInterval: 1, roundOffSeconds: true, - + showHeader: true, titleContentDate: "Set Date", titleContentTime: "Set Time", titleContentDateTime: "Set Date & Time", - + buttonsToDisplay: ["HeaderCloseButton", "SetButton", "ClearButton"], setButtonContent: "Set", clearButtonContent: "Clear", @@ -6476,7 +6476,7 @@ $.DateTimePicker = $.DateTimePicker || { decrementButtonContent: "-", setValueInTextboxOnEveryClick: false, readonlyInputs: false, - + animationDuration: 400, touchHoldInterval: 300, // in Milliseconds @@ -6484,7 +6484,7 @@ $.DateTimePicker = $.DateTimePicker || { mouseHoldInterval: 50, // in Milliseconds captureMouseHold: false, // capture Mouse Hold Event - + isPopup: true, parentElement: "body", @@ -6492,7 +6492,7 @@ $.DateTimePicker = $.DateTimePicker || { inputElement: null, language: "", - + init: null, // init(oDateTimePicker) addEventHandlers: null, // addEventHandlers(oDateTimePicker) beforeShow: null, // beforeShow(oInputElement) @@ -6502,14 +6502,14 @@ $.DateTimePicker = $.DateTimePicker || { buttonClicked: null, // buttonClicked(sButtonType, oInputElement) where sButtonType = "SET"|"CLEAR"|"CANCEL"|"TAB" settingValueOfElement: null, // settingValueOfElement(sValue, dDateTime, oInputElement) formatHumanDate: null, // formatHumanDate(oDateTime, sMode, sFormat) - + parseDateTimeString: null, // parseDateTimeString(sDateTime, sMode, sFormat, oInputField) formatDateTimeString: null // formatDateTimeString(oDateTime, sMode, sFormat, oInputField) }, dataObject: // Temporary Variables For Calculation Specific to DateTimePicker Instance { - + dCurrentDate: new Date(), iCurrentDay: 0, iCurrentMonth: 0, @@ -6519,14 +6519,14 @@ $.DateTimePicker = $.DateTimePicker || { iCurrentSeconds: 0, sCurrentMeridiem: "", iMaxNumberOfDays: 0, - + sDateFormat: "", sTimeFormat: "", sDateTimeFormat: "", - + dMinValue: null, dMaxValue: null, - + sArrInputDateFormats: [], sArrInputTimeFormats: [], sArrInputDateTimeFormats: [], @@ -6535,12 +6535,12 @@ $.DateTimePicker = $.DateTimePicker || { bDateMode: false, bTimeMode: false, bDateTimeMode: false, - + oInputElement: null, iTabIndex: 0, bElemFocused: false, - + bIs12Hour: false, sTouchButton: null, @@ -6570,29 +6570,29 @@ $.cf = { return false; } else - return false; + return false; } }; -(function (factory) +(function (factory) { - if(typeof define === "function" && define.amd) + if(typeof define === "function" && define.amd) { // AMD. Register as an anonymous module. define(["jquery"], factory); } - else if(typeof exports === "object") + else if(typeof exports === "object") { // Node/CommonJS module.exports = factory(require("jquery")); } - else + else { // Browser globals factory(jQuery); } -}(function ($) +}(function ($) { "use strict"; @@ -6619,7 +6619,7 @@ $.cf = { iKey, sKey; if(typeof options === "string") - { + { if($.cf._isValid(oDTP)) { if(options === "destroy") @@ -6632,17 +6632,17 @@ $.cf = { if(sKey.search("plugin_DateTimePicker") !== -1) { $(document).unbind("click.DateTimePicker keydown.DateTimePicker keyup.DateTimePicker"); - + $(this).children().remove(); $(this).removeData(); $(this).unbind(); $(this).removeClass("dtpicker-overlay dtpicker-mobile dtpicker-inline"); oDTP = oDTP[sKey]; - + console.log("Destroyed DateTimePicker Object"); console.log(oDTP); - + break; } } @@ -6674,7 +6674,7 @@ $.cf = { } else { - return this.each(function() + return this.each(function() { $.removeData(this, "plugin_DateTimePicker"); if(!$.data(this, "plugin_DateTimePicker")) @@ -6684,12 +6684,12 @@ $.cf = { }; DateTimePicker.prototype = { - + // Public Method - init: function () + init: function () { - var oDTP = this; - + var oDTP = this; + oDTP._setDateFormatArray(); // Set DateFormatArray oDTP._setTimeFormatArray(); // Set TimeFormatArray oDTP._setDateTimeFormatArray(); // Set DateTimeFormatArray @@ -6699,7 +6699,7 @@ $.cf = { { oDTP.settings.parentElement = $(oDTP.element).data('parentelement'); } - + if(oDTP.settings.isPopup && !oDTP.settings.isInline) { oDTP._createPicker(); @@ -6717,26 +6717,26 @@ $.cf = { oDTP._addEventHandlersForInput(); }, - + _setDateFormatArray: function() { var oDTP = this; - - oDTP.oData.sArrInputDateFormats = []; + + oDTP.oData.sArrInputDateFormats = []; var sDate = ""; - + // 0 - "dd-MM-yyyy" sDate = "dd" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "yyyy"; oDTP.oData.sArrInputDateFormats.push(sDate); - + // 1 - "MM-dd-yyyy" sDate = "MM" + oDTP.settings.dateSeparator + "dd" + oDTP.settings.dateSeparator + "yyyy"; oDTP.oData.sArrInputDateFormats.push(sDate); - + // 2 - "yyyy-MM-dd" sDate = "yyyy" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "dd"; oDTP.oData.sArrInputDateFormats.push(sDate); - + // 3 - "dd-MMM-yyyy" sDate = "dd" + oDTP.settings.dateSeparator + "MMM" + oDTP.settings.dateSeparator + "yyyy"; oDTP.oData.sArrInputDateFormats.push(sDate); @@ -6757,35 +6757,35 @@ $.cf = { sDate = "yyyy" + oDTP.settings.monthYearSeparator + "MM"; oDTP.oData.sArrInputDateFormats.push(sDate); }, - + _setTimeFormatArray: function() { var oDTP = this; - + oDTP.oData.sArrInputTimeFormats = []; var sTime = ""; // 0 - "hh:mm:ss AA" sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss" + oDTP.settings.timeMeridiemSeparator + "AA"; oDTP.oData.sArrInputTimeFormats.push(sTime); - + // 1 - "HH:mm:ss" sTime = "HH" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss"; oDTP.oData.sArrInputTimeFormats.push(sTime); - + // 2 - "hh:mm AA" sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeMeridiemSeparator + "AA"; oDTP.oData.sArrInputTimeFormats.push(sTime); - + // 3 - "HH:mm" sTime = "HH" + oDTP.settings.timeSeparator + "mm"; oDTP.oData.sArrInputTimeFormats.push(sTime); }, - + _setDateTimeFormatArray: function() { var oDTP = this; - + oDTP.oData.sArrInputDateTimeFormats = []; var sDate = "", sTime = "", sDateTime = ""; @@ -6794,43 +6794,43 @@ $.cf = { sTime = "HH" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 1 - "dd-MM-yyyy hh:mm:ss AA" sDate = "dd" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 2 - "MM-dd-yyyy HH:mm:ss" sDate = "MM" + oDTP.settings.dateSeparator + "dd" + oDTP.settings.dateSeparator + "yyyy"; sTime = "HH" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 3 - "MM-dd-yyyy hh:mm:ss AA" sDate = "MM" + oDTP.settings.dateSeparator + "dd" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 4 - "yyyy-MM-dd HH:mm:ss" sDate = "yyyy" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "dd"; sTime = "HH" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 5 - "yyyy-MM-dd hh:mm:ss AA" sDate = "yyyy" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "dd"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 6 - "dd-MMM-yyyy hh:mm:ss" sDate = "dd" + oDTP.settings.dateSeparator + "MMM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 7 - "dd-MMM-yyyy hh:mm:ss AA" sDate = "dd" + oDTP.settings.dateSeparator + "MMM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeSeparator + "ss" + oDTP.settings.timeMeridiemSeparator + "AA"; @@ -6838,49 +6838,49 @@ $.cf = { oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); //-------------- - + // 8 - "dd-MM-yyyy HH:mm" sDate = "dd" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "HH" + oDTP.settings.timeSeparator + "mm"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 9 - "dd-MM-yyyy hh:mm AA" sDate = "dd" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 10 - "MM-dd-yyyy HH:mm" sDate = "MM" + oDTP.settings.dateSeparator + "dd" + oDTP.settings.dateSeparator + "yyyy"; sTime = "HH" + oDTP.settings.timeSeparator + "mm"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 11 - "MM-dd-yyyy hh:mm AA" sDate = "MM" + oDTP.settings.dateSeparator + "dd" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 12 - "yyyy-MM-dd HH:mm" sDate = "yyyy" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "dd"; sTime = "HH" + oDTP.settings.timeSeparator + "mm"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 13 - "yyyy-MM-dd hh:mm AA" sDate = "yyyy" + oDTP.settings.dateSeparator + "MM" + oDTP.settings.dateSeparator + "dd"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeMeridiemSeparator + "AA"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 14 - "dd-MMM-yyyy hh:mm" sDate = "dd" + oDTP.settings.dateSeparator + "MMM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm"; sDateTime = sDate + oDTP.settings.dateTimeSeparator + sTime; oDTP.oData.sArrInputDateTimeFormats.push(sDateTime); - + // 15 - "dd-MMM-yyyy hh:mm AA" sDate = "dd" + oDTP.settings.dateSeparator + "MMM" + oDTP.settings.dateSeparator + "yyyy"; sTime = "hh" + oDTP.settings.timeSeparator + "mm" + oDTP.settings.timeMeridiemSeparator + "AA"; @@ -6925,7 +6925,7 @@ $.cf = { ); } }, - + _setMatchFormat: function(iArgsLength, sMode, sFormat) { var oDTP = this; @@ -6937,7 +6937,7 @@ $.cf = { _createPicker: function() { var oDTP = this; - + if(oDTP.settings.isInline) { $(oDTP.element).addClass("dtpicker-inline"); @@ -6950,8 +6950,8 @@ $.cf = { oDTP._hidePicker(""); }); } - - var sTempStr = ""; + + var sTempStr = ""; sTempStr += "