Merge pull request 'dev' (#45) from dev into master

Reviewed-on: WillaEngine-Project/WillaEngine#45

resources/js/Global/plugins/globalComponent.js

@@ -105,8 +105,7 @@ import store from "@Global/store/index";
 store.dispatch('common/setCurrentTime');
 
 //jalali => 0.6MB
+import moment from "moment"
+moment.locale('fa');
 import jalaliMoment from "vue-jalali-moment"
-import momment from "moment"
+Vue.use(jalaliMoment,{moment});
-import Wireframe from "@Global/components/Blocks/Wireframe";
-momment.locale('fa');
-Vue.use(jalaliMoment);

resources/js/Global/utils/date/jalali-date.js

@@ -1,10 +1,9 @@
 import moment from "jalali-moment";
-import Vue from "vue";
 
 const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) {
-    return date ? Vue.prototype.$moment(date).format(format) : defaultDate ;
+    return date ? moment(date).locale('fa').format(format) : defaultDate ;
 };
 const convertNowToJalali = function (date = null, format = "jYYYY/jMM/jDD" ) {
-    return date ? Vue.prototype.$moment(date).format(format) : Vue.prototype.$moment(new Date()).format(format) ;
+    return date ? moment(date).locale('fa').format(format) : moment(new Date()).locale('fa').format(format) ;
 };
 export { convertToJalali, convertNowToJalali };