Changeset 2796867

Timestamp:

10/11/2022 04:24:38 AM (3 years ago)

Author:

loymax

Message:

squared icons on map

Location:

loymaxapp/trunk

Files:

• admin/loymax-config.php (modified) (1 diff)
• loymax-app.php (modified) (1 diff)
• public/app.min.js (modified) (2 diffs)
• public/css/style.min.css (modified) (1 diff)
• readme.txt (modified) (1 diff)

loymaxapp/trunk/admin/loymax-config.php

@@ -144 +144 @@
             ),
             'authWithPassword' => array(
-                'name' => 'Auth with ',
+                'name' => 'Auth with password',
                 'value' => 'true',
                 'type' => 'bool',

loymaxapp/trunk/loymax-app.php

@@ -4 +4 @@
  * Plugin Name: LoymaxWebApp
  * Description: Loymax loyalty program User Portal configuration.
- * Version: 3.4.0
+ * Version: 3.4.1
  * Author URI:  https://loymax.ru/
  * Author: Loymax solutions

loymaxapp/trunk/public/app.min.js

@@ -1 +1 @@
 /**
- * Loymax v2.2.20220930 (http://loymax.ru)
+ * Loymax v2.2.20221007 (http://loymax.ru)
  * Copyright 2011-2022 Loymax, Inc.
  * License: MIT
@@ -9229 +9229 @@
 "use strict";!function(r){r.module("lmxApp").factory("$translateStaticFilesLoader",["$http","$log","$q","YAML","FALLBACK_YAML_TRANSLATIONS",function(i,e,f,t,n){return function(s){function a(){e.info("Используется встроеная таблица переводов");var r;try{return r=t.parse(n)}catch(i){return e.error("Ошибка парсинга Fallback-локали"),null}}if(!(s&&(r.isArray(s.files)||r.isString(s.prefix)&&r.isString(s.suffix))))throw new Error("Couldn't load static files, no files and prefix or suffix specified!");s.files||(s.files=[{prefix:s.prefix,suffix:s.suffix}]);var u=function(n){if(!n||!r.isString(n.prefix)||!r.isString(n.suffix)){var u="Ошибка загрузки локали:";throw n?r.isString(n.prefix)?r.isString(n.suffix)||(u+=" суффикс не распознан"):u+=" префикс не распознан":u+=" отсутствует файл",new Error(u)}var o=[n.prefix,s.key,n.suffix].join("");return r.isObject(s.fileMap)&&s.fileMap[o]&&(o=s.fileMap[o]),i(r.extend({url:o,method:"GET"},s.$http)).then(function(r){if(o.match(/\.ya?ml$/)){var i;try{return i=t.parse(r.data)}catch(n){return e.error("Ошибка парсинга "+o+". Проверьте правильность формата."),a()||f.reject(s.key)}}return r.data},function(){return e.info("Файл локали не найден ("+o+")"),a()||f.reject(s.key)})};return u({prefix:s.files[0].prefix,key:s.key,suffix:s.files[0].suffix})}}])}(angular);
 "use strict";!function(t){t.module("lmxApp").factory("locationService",["$http","configurationService","localStorageService",function(e,n,i){function r(){return i.get("version").major>=2022}function o(t){return t.then(function(t){return t.data})}function u(e,n,i){return{params:t.extend({startWith:e||null,count:n||10},i)}}function s(t){return o(e.get(p+"Regions",{params:t}))}function c(t,n){return o(e.get(p+"Region/"+n+"/Cities",{params:t}))}function a(t,n){return o(e.get(p+"CitiesStartWith",u(t,n)))}function g(t,n){return o(e.get(p+"Cities",u(t,n)))}function f(t,n,i){return o(e.get(p+"Streets",u(t,i,{city:n})))}function l(t,n,i){return o(e.get(p+"Houses",u(t,i,{street:n})))}var m=r()?"v1.2/Locations/":"api/Location/",p=n.host+m;return{getRegions:s,getCitiesByRegion:c,getCities:g,getCitiesNames:a,getStreets:f,getHouses:l}}])}(angular);
-"use strict";!function(e){e.module("lmxApp").factory("mapService",["$q","$rootScope","$window","configurationService","openHoursService","scriptLoadService","toArrayFilter","markdown",function(t,o,n,a,l,s,c,r){var i=function(){function i(e){C=e}function u(e){var o=e.properties.get("schedule");return o?e.properties.get("scheduleProcessed")?l.getCurrentStatus(o).then(function(t){var o='<p class="lmx-map-balloon-schedule '+(t.isOpen?"_open":"_close")+'">'+t.text+"</p>",n=e.properties.get("balloonContent");n=n.replace(/(<div id="lmx-merchant-status">)()(<\/div>)/,"$1"+o+"$3"),e.properties.set("balloonContent",n)}):l.getOpenHours(o).then(function(t){e.properties.set("scheduleProcessed",!0);var o="<ul>"+t.openHours.map(function(e){return"<li>"+e+"</li>"}).join("")+"</ul>",n='<p class="lmx-map-balloon-schedule '+(t.currentStatus.isOpen?"_open":"_close")+'">'+t.currentStatus.text+"</p>",a=e.properties.get("balloonContent");a=a.replace(/(<div id="lmx-merchant-schedule">)()(<\/div>)/,"$1"+o+"$3").replace(/(<div id="lmx-merchant-status">)()(<\/div>)/,"$1"+n+"$3"),e.properties.set("balloonContent",a)}):t.when()}function m(e,t){e.iconLayout="default#image",e.iconImageHref=t,e.iconImageSize=$.iconImageSize,e.iconImageOffset=$.iconImageOffset}function p(e){f.removeAll(),h.geoObjects.removeAll(),y={},e.forEach(function(e,t){if(e.location){var n="",a={hideIconOnBalloonOpen:!0};$.useCustomBalloon?a.balloonLayout=x:(n='<div class="lmx-map-balloon-wrapper">',e.imgUrl&&(n+='<div class="lmx-map-balloon-brand-logo-container"><img src="'+e.imgUrl+'" alt=""></div>'),e.markerImgUrl?m(a,e.markerImgUrl):$.useCustomIcon?m(a,$.iconImageHref):a.preset=$.preset,n+='<h2 class="lmx-map-balloon-merchant-title">'+e.title+'</h2><p class="lmx-map-balloon-merchant-location">'+e.location.description+"</p>",e.scheduleModel&&(n+='<div class="lmx-map-balloon-merchant-schedule"><p><strong>'.concat(C["merchants.schedule"],"</strong></p>")+'<div id="lmx-merchant-schedule"></div><div id="lmx-merchant-status"></div></div>'),e.contacts&&(n+="<p>".concat(C["contacts.title"],": ").concat(e.contacts,"</p>")),e.description&&(n+='<div class="lmx-map-balloon-merchant-description">',n+=r.makeHtml(e.description),n+="</div>"),n+="</div>");var l=new ymaps.Placemark([e.location.latitude,e.location.longitude],{id:e.id,name:e.title,location:e.location.description,schedule:e.scheduleModel,balloonContent:n},a);l.events.add("click",function(e){var t="isForcedLmxEvent";if(!e.get(t)){var o=e.get("target");o.properties.get("schedule")&&(e.preventDefault(),e.stopPropagation(),u(o).then(function(){var e={};e[t]=!0,o.events.fire("click",e)}))}}),l.events.add("balloonopen",function(e){o.$broadcast("yMapsBalloonOpened",e.get("target").properties.getAll())}),l.events.add("balloonclose",function(e){o.$broadcast("yMapsBalloonClosed",e.get("target").properties.getAll())}),y[t]=l}}),f.add(c(y,!1)),h.geoObjects.add(f),h.setBounds(f.getBounds(),{checkZoomRange:!0,duration:300,preciseZoom:!0,zoomMargin:1})}function d(e,t){b='<div class="lmx-balloon"><h2 class="lmx-title">{{ properties.name }}</h2><img class="lmx-close" src="'+$.balloonCloseImage+'" alt="" /></div>',ymaps.ready(function(){o.$apply(function(){o.$broadcast("ymapsReady")}),h=new ymaps.Map(e,w),$.useCustomBalloon&&(x=ymaps.templateLayoutFactory.createClass(b,{build:function(){x.superclass.build.call(this);var e=this.getParentElement().querySelector(".lmx-balloon");e.style.marginTop="-"+e.offsetHeight+"px",e.querySelector(".lmx-close").addEventListener("click",this.onCloseClick.bind(this))},clear:function(){x.superclass.clear.call(this)},onCloseClick:function(){this.events.fire("userclose")}})),L.customClusterIconContentLayout&&(L.clusterIconContentLayout=ymaps.templateLayoutFactory.createClass(L.customClusterIconContentLayout),delete L.customClusterIconContentLayout),f=new ymaps.Clusterer(L),p(t),n.lmxMap=h;var a=new CustomEvent("lmxMapReady",{detail:"Loymax map object in window.lmxMap"});document.dispatchEvent(a)})}function g(t,o){var l=a.common.map||{};e.extend(S,l.general),e.extend(w,l.state),e.extend($,l.marker),e.extend(L,l.cluster),n.ymaps?d(t,o):k.load("https://api-maps.yandex.ru/"+S.version+"/?lang=ru_RU&load="+S.load,function(){d(t,o)})}function v(e){var t=y[e];t&&u(t).then(function(){var e=f.getObjectState(t);e.isClustered?h.setCenter(t.geometry.getCoordinates(),I+1,{checkZoomRange:!0}).then(function(){t.balloon.open()}):h.panTo(t.geometry.getCoordinates(),{flying:!1}).then(function(){t.balloon.open()})})}var f,h,y,b,x,C,I=14,k=new s,S={version:"2.1.55",load:"package.map,package.clusters"},w={center:[56.49771,84.97437],zoom:13,controls:[]},$={preset:"islands#blueDotIcon",useCustomIcon:!1,iconImageHref:"",iconImageSize:[35,45],iconImageOffset:[-20,-47],useCustomBalloon:!1},L={preset:"islands#invertedBlueClusterIcons",maxZoom:I};return{setYmaps:g,showBalloon:v,updateData:p,setTranslates:i}};return i}])}(angular);
+"use strict";!function(e){e.module("lmxApp").factory("mapService",["$q","$rootScope","$window","configurationService","openHoursService","scriptLoadService","toArrayFilter","markdown",function(t,o,n,a,l,s,c,r){var i=function(){function i(e){C=e}function u(e){var o=e.properties.get("schedule");return o?e.properties.get("scheduleProcessed")?l.getCurrentStatus(o).then(function(t){var o='<p class="lmx-map-balloon-schedule '+(t.isOpen?"_open":"_close")+'">'+t.text+"</p>",n=e.properties.get("balloonContent");n=n.replace(/(<div id="lmx-merchant-status">)()(<\/div>)/,"$1"+o+"$3"),e.properties.set("balloonContent",n)}):l.getOpenHours(o).then(function(t){e.properties.set("scheduleProcessed",!0);var o="<ul>"+t.openHours.map(function(e){return"<li>"+e+"</li>"}).join("")+"</ul>",n='<p class="lmx-map-balloon-schedule '+(t.currentStatus.isOpen?"_open":"_close")+'">'+t.currentStatus.text+"</p>",a=e.properties.get("balloonContent");a=a.replace(/(<div id="lmx-merchant-schedule">)()(<\/div>)/,"$1"+o+"$3").replace(/(<div id="lmx-merchant-status">)()(<\/div>)/,"$1"+n+"$3"),e.properties.set("balloonContent",a)}):t.when()}function m(e,t){e.iconLayout="default#image",e.iconImageHref=t,e.iconImageSize=$.iconImageSize,e.iconImageOffset=$.iconImageOffset}function p(e){f.removeAll(),h.geoObjects.removeAll(),y={},e.forEach(function(e,t){if(e.location){var n="",a={hideIconOnBalloonOpen:!0};$.useCustomBalloon?a.balloonLayout=x:(n='<div class="lmx-map-balloon-wrapper">',e.imgUrl&&(n+='<div class="lmx-map-balloon-brand-logo-container"><img src="'+e.imgUrl+'" alt=""></div>'),e.markerImgUrl?m(a,e.markerImgUrl):$.useCustomIcon?m(a,$.iconImageHref):a.preset=$.preset,n+='<h2 class="lmx-map-balloon-merchant-title">'+e.title+'</h2><p class="lmx-map-balloon-merchant-location">'+e.location.description+"</p>",e.scheduleModel&&(n+='<div class="lmx-map-balloon-merchant-schedule"><p><strong>'.concat(C["merchants.schedule"],"</strong></p>")+'<div id="lmx-merchant-schedule"></div><div id="lmx-merchant-status"></div></div>'),e.contacts&&(n+="<p>".concat(C["contacts.title"],": ").concat(e.contacts,"</p>")),e.description&&(n+='<div class="lmx-map-balloon-merchant-description">',n+=r.makeHtml(e.description),n+="</div>"),n+="</div>");var l=new ymaps.Placemark([e.location.latitude,e.location.longitude],{id:e.id,name:e.title,location:e.location.description,schedule:e.scheduleModel,balloonContent:n},a);l.events.add("click",function(e){var t="isForcedLmxEvent";if(!e.get(t)){var o=e.get("target");o.properties.get("schedule")&&(e.preventDefault(),e.stopPropagation(),u(o).then(function(){var e={};e[t]=!0,o.events.fire("click",e)}))}}),l.events.add("balloonopen",function(e){o.$broadcast("yMapsBalloonOpened",e.get("target").properties.getAll())}),l.events.add("balloonclose",function(e){o.$broadcast("yMapsBalloonClosed",e.get("target").properties.getAll())}),y[t]=l}}),f.add(c(y,!1)),h.geoObjects.add(f),h.setBounds(f.getBounds(),{checkZoomRange:!0,duration:300,preciseZoom:!0,zoomMargin:1})}function d(e,t){b='<div class="lmx-balloon"><h2 class="lmx-title">{{ properties.name }}</h2><img class="lmx-close" src="'+$.balloonCloseImage+'" alt="" /></div>',ymaps.ready(function(){o.$apply(function(){o.$broadcast("ymapsReady")}),h=new ymaps.Map(e,w),$.useCustomBalloon&&(x=ymaps.templateLayoutFactory.createClass(b,{build:function(){x.superclass.build.call(this);var e=this.getParentElement().querySelector(".lmx-balloon");e.style.marginTop="-"+e.offsetHeight+"px",e.querySelector(".lmx-close").addEventListener("click",this.onCloseClick.bind(this))},clear:function(){x.superclass.clear.call(this)},onCloseClick:function(){this.events.fire("userclose")}})),L.customClusterIconContentLayout&&(L.clusterIconContentLayout=ymaps.templateLayoutFactory.createClass(L.customClusterIconContentLayout),delete L.customClusterIconContentLayout),f=new ymaps.Clusterer(L),p(t),n.lmxMap=h;var a=new CustomEvent("lmxMapReady",{detail:"Loymax map object in window.lmxMap"});document.dispatchEvent(a)})}function g(t,o){var l=a.common.map||{};e.extend(S,l.general),e.extend(w,l.state),e.extend($,l.marker),e.extend(L,l.cluster),n.ymaps?d(t,o):k.load("https://api-maps.yandex.ru/"+S.version+"/?lang=ru_RU&load="+S.load,function(){d(t,o)})}function v(e){var t=y[e];t&&u(t).then(function(){var e=f.getObjectState(t);e.isClustered?h.setCenter(t.geometry.getCoordinates(),I+1,{checkZoomRange:!0}).then(function(){t.balloon.open()}):h.panTo(t.geometry.getCoordinates(),{flying:!1}).then(function(){t.balloon.open()})})}var f,h,y,b,x,C,I=14,k=new s,S={version:"2.1.55",load:"package.map,package.clusters"},w={center:[56.49771,84.97437],zoom:13,controls:[]},$={preset:"islands#blueDotIcon",useCustomIcon:!1,iconImageHref:"",iconImageSize:[45,45],iconImageOffset:[-20,-47],useCustomBalloon:!1},L={preset:"islands#invertedBlueClusterIcons",maxZoom:I};return{setYmaps:g,showBalloon:v,updateData:p,setTranslates:i}};return i}])}(angular);
 "use strict";!function(e){e.module("markdown").config(["markdownProvider",function(e){e.config({omitExtraWLInCodeBlocks:!0,noHeaderId:!0,parseImgDimensions:!0,simplifiedAutoLink:!1,literalMidWordUnderscores:!0,strikethrough:!0,tables:!0,ghCodeBlocks:!0,tasklists:!0,smoothLivePreview:!0,prefixHeaderId:!1,disableForced4SpacesIndentedSublists:!1,ghCompatibleHeaderId:!0,smartIndentationFix:!1,simpleLineBreaks:!0})}])}(angular);
 "use strict";!function(){Array.prototype.insertAt=function(t,r){return this.splice(t,0,r),this},Array.prototype.remove=function(t){var r=this.indexOf(t);return this.removeAt(r),this},Array.prototype.removeAt=function(t){return t>=0&&t<this.length&&this.splice(t,1),this},Array.prototype.occurrencesCount=function(t){for(var r=0,e=t.length-1;e>=0;--e)this.contains(t[e])&&r++;return r},Array.prototype.contains=function(t){return this.indexOf(t)!==-1},Array.prototype.flatten=function(){for(var t=[],r=0;r<this.length;r++){var e=this[r];angular.isArray(e)?t=t.concat(e.flatten()):t.push(e)}return t},Array.prototype.fieldValues=function(t){for(var r=[],e=0;e<this.length;e++)r.push(this[e][t]);return r},Array.prototype.toDictionary=function(t,r){if(this.length<1)return null;0===arguments.length&&(t="id",r="name");for(var e={},n=this.length-1;n>=0;--n)e[this[n][t]]=angular.isDefined(r)?this[n][r]:this[n];return e},Array.prototype.uniqueValues=function(t){var r=[];if(t)for(var e=0;e<this.length;e++)r.contains(this[e][t])||r.push(this[e][t]);else r=this.filter(function(t,r,e){return e.indexOf(t)===r});return r},Array.prototype.indexOfObjectByField=function(t,r){for(var e=null,n=0;n<this.length;n++)if(this[n].hasOwnProperty(t)){if(!angular.isDefined(r)){e=n;break}if(this[n][t]===r){e=n;break}}return e},Array.prototype.getObjectByField=function(t,r){return this[this.indexOfObjectByField(t,r)]||null},Array.prototype.pushArray=function(t){return Array.prototype.push.apply(this,t),this},Array.prototype.find||(Array.prototype.find=function(t){if(null===this)throw new TypeError("Array.prototype.find called on null or undefined");if("function"!=typeof t)throw new TypeError("predicate must be a function");for(var r,e=Object(this),n=e.length>>>0,i=arguments[1],o=0;o<n;o++)if(r=e[o],t.call(i,r,o,e))return r}),Array.prototype.includes||Object.defineProperty(Array.prototype,"includes",{value:function(t,r){function e(t,r){return t===r||"number"==typeof t&&"number"==typeof r&&isNaN(t)&&isNaN(r)}if(null==this)throw new TypeError('"this" is null or not defined');var n=Object(this),i=n.length>>>0;if(0===i)return!1;for(var o=0|r,u=Math.max(o>=0?o:i-Math.abs(o),0);u<i;){if(e(n[u],t))return!0;u++}return!1}})}();

loymaxapp/trunk/public/css/style.min.css

@@ -1 +1 @@
 /**
- * Loymax v2.2.20220930 (http://loymax.ru)
+ * Loymax v2.2.20221007 (http://loymax.ru)
  * Copyright 2011-2022 Loymax, Inc.
  * License: MIT

loymaxapp/trunk/readme.txt

@@ -37 +37 @@
 
 == Changelog ==
+= 3.4.0 - 3.4.1 =
+* Изменен метод апи на locations, квадратные иконки на карте
 = 3.3.9 =
 * Фикс создания нового пароля при переходе на ссылку с кодом по почте