Improved date formatting for extendedUpdates adjustments

craftcms · Jan 16, 2019 · 0561661 · 0561661
1 parent a92e63d
commit 0561661
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/src/web/assets/pluginstore/dist/css/app.css b/src/web/assets/pluginstore/dist/css/app.css
diff --git a/src/web/assets/pluginstore/dist/js/app.js b/src/web/assets/pluginstore/dist/js/app.js
diff --git a/src/web/assets/pluginstore/dist/js/app.js.map b/src/web/assets/pluginstore/dist/js/app.js.map
diff --git a/src/web/assets/pluginstore/src/js/components/modal/steps/Cart.vue b/src/web/assets/pluginstore/src/js/components/modal/steps/Cart.vue
@@ -64,7 +64,12 @@
                                     <td class="blank-cell"></td>
                                     <td class="blank-cell"></td>
                                     <td>
-                                        {{adjustment.name}}
+                                        <template v-if="adjustment.sourceSnapshot.type === 'extendedUpdates'">
+                                            {{"Updates until {date}"|t('app', {date: $options.filters.formatDate(adjustment.sourceSnapshot.expiryDate)})}}
+                                        </template>
+                                        <template v-else>
+                                            {{adjustment.name}}
+                                        </template>
                                     </td>
                                     <td class="price">
                                         {{adjustment.amount|currency}}
@@ -313,6 +318,9 @@
                 return true
             },
 
+            updatesUntil(date) {
+                return this.$options.filters.t("Updates until {date}", 'app', {date})
+            }
         },
 
     }

diff --git a/src/web/assets/pluginstore/src/js/filters/craft.js b/src/web/assets/pluginstore/src/js/filters/craft.js
@@ -8,6 +8,11 @@ export function t(message, category, params) {
     return Craft.t(category, message, params)
 }
 
+
+export function formatDate(date) {
+    return Craft.formatDate(date)
+}
+
 export function formatNumber(number, format = ',.0f') {
     return Craft.formatNumber(number, format)
-}
+}
diff --git a/src/web/assets/pluginstore/src/main.js b/src/web/assets/pluginstore/src/main.js
@@ -4,7 +4,7 @@
 
 import Vue from 'vue'
 import {currency} from './js/filters/currency'
-import {escapeHtml, formatNumber, t} from './js/filters/craft'
+import {escapeHtml, formatDate, formatNumber, t} from './js/filters/craft'
 import router from './js/router'
 import store from './js/store'
 import {mapState} from 'vuex'
@@ -18,6 +18,7 @@ import './js/plugins/font-awesome'
 
 Vue.filter('currency', currency)
 Vue.filter('escapeHtml', escapeHtml)
+Vue.filter('formatDate', formatDate)
 Vue.filter('formatNumber', formatNumber)
 Vue.filter('t', t)