Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented: toast notification on camera permission denial in Scanner (#165) #167

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@hotwax/app-version-info": "^1.0.0",
"@hotwax/apps-theme": "^1.1.0",
"@hotwax/dxp-components": "^1.3.4",
"@hotwax/oms-api": "^1.6.0",
"@hotwax/oms-api": "^1.10.0",
"@ionic/core": "6.7.5",
"@ionic/vue": "6.7.5",
"@ionic/vue-router": "6.7.5",
Expand Down
3 changes: 2 additions & 1 deletion src/adapter/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { api, client, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
import { api, client, getConfig, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'

export {
api,
client,
getConfig,
initialise,
resetConfig,
updateInstanceUrl,
Expand Down
3 changes: 2 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"App": "App",
"Authenticating": "Authenticating",
"Are you sure you want to change the time zone to?": "Are you sure you want to change the time zone to {timeZoneId}?",
"product barcode": "product barcode",
"Camera permission denied.": "Camera permission denied.",
"Cancel": "Cancel",
"Change": "Change",
"Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
Expand Down Expand Up @@ -35,6 +35,7 @@
"Picklist Completed": "Picklist Completed",
"Picklists": "Picklists",
"Please allow camera access in your settings": "Please allow camera access in your settings",
"product barcode": "product barcode",
"Product not found": "Product not found",
"Product not found in remaining items": "Product not found in remaining items",
"Scan": "Scan",
Expand Down
5 changes: 4 additions & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import i18n from './i18n'
import store from './store'
import { dxpComponents } from '@hotwax/dxp-components'
import { login, logout, loader } from './user-utils';
import { getConfig, initialise } from '@hotwax/oms-api';

const app = createApp(App)
.use(IonicVue, {
Expand All @@ -43,7 +44,9 @@ const app = createApp(App)
login,
logout,
loader,
appLoginUrl: process.env.VUE_APP_LOGIN_URL as string
appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
getConfig,
initialise
});

// Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters
Expand Down
12 changes: 9 additions & 3 deletions src/views/Picklist-Detail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,22 @@ export default defineComponent({
})
},
async scanCode() {
const modal = await modalController
try {
// checking camera permission before opening the scanner
await navigator.mediaDevices.getUserMedia({ video: true });
const modal = await modalController
.create({
component: Scanner,
});
modal.onDidDismiss()
modal.onDidDismiss()
.then((result) => {
//result : value of the scanned barcode/QRcode
this.selectProduct(result.data.value)
});
return modal.present();
return modal.present();
} catch (err) {
showToast(translate("Camera permission denied."));
}
},
sortPickists() {
// Sort picklist products based on the sorting parameter selected
Expand Down
9 changes: 8 additions & 1 deletion vue.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
const path = require('path')
require("@hotwax/app-version-info")
module.exports = {
// WHY THIS CONFIG: Error while using pinia while importing dxp-components -
// Can't import the named export 'computed' from non EcmaScript module (only default export is available)
// WHY ERROR: Using Vue CLI 4.x may cause this error (according to Pinia docs, did their suggested resolution)
// REFERENCE: https://pinia.vuejs.org/cookbook/migration-v1-v2.html#webpack-4-support
configureWebpack: {
resolve: {
alias: {
vue: path.resolve('./node_modules/vue')
}
},
module: {
rules: [
{
Expand All @@ -27,5 +33,6 @@ module.exports = {
enableInSFC: true
}
},
runtimeCompiler: true
runtimeCompiler: true,
transpileDependencies: ['@hotwax/dxp-components']
}
Loading