Skip to content
Open
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
8 changes: 4 additions & 4 deletions barcode_camera/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"barcode_scanner",
],
"assets": {
"web.assets_backend": [
"barcode_camera/static/src/scss/barcode_camera.scss",
"barcode_camera/static/src/xml/camera_fab.xml",
"barcode_camera/static/src/js/camera_fab.esm.js",
"barcode_scanner.assets": [
"barcode_camera/static/src/components/**/*.esm.js",
"barcode_camera/static/src/components/**/*.xml",
"barcode_camera/static/src/components/**/*.scss",
],
"web.assets_unit_tests": [
"barcode_camera/static/tests/**/*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, useState} from "@odoo/owl";
import {BarcodeDialog} from "@web/core/barcode/barcode_dialog";
import {barcodeAppWidgets} from "@barcode_scanner/js/registries.esm";
import {barcodeAppWidgets} from "@barcode_scanner/registries.esm";
import {isBarcodeScannerSupported} from "@web/core/barcode/barcode_video_scanner";
import {useService} from "@web/core/utils/hooks";

Expand Down
12 changes: 6 additions & 6 deletions barcode_camera/static/tests/camera_fab.test.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {Component, useState, xml} from "@odoo/owl";
import {animationFrame, click, waitFor, waitForNone} from "@odoo/hoot-dom";
import {describe, expect, test} from "@odoo/hoot";
import {
getService,
mockService,
mountWithCleanup,
patchWithCleanup,
} from "@web/../tests/web_test_helpers";
import {Component, useState, xml} from "@odoo/owl";
import {animationFrame, click, waitFor, waitForNone} from "@odoo/hoot-dom";
import {describe, expect, test} from "@odoo/hoot";
import {BarcodeDialog} from "@web/core/barcode/barcode_dialog";
import {CameraFab} from "@barcode_camera/js/camera_fab.esm";
import {barcodeAppWidgets} from "@barcode_scanner/js/registries.esm";
import {CameraFab} from "@barcode_camera/components/camera_fab/camera_fab.esm";
import {barcodeAppWidgets} from "@barcode_scanner/registries.esm";
import {browser} from "@web/core/browser/browser";
import {useBarcodeHandler} from "@barcode_scanner/js/hooks/use_barcode_handler.esm";
import {useBarcodeHandler} from "@barcode_scanner/hooks/use_barcode_handler.esm";

// A browser that can open the camera.
function withCamera() {
Expand Down
6 changes: 2 additions & 4 deletions barcode_gs1/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
"barcodes_gs1_nomenclature",
],
"assets": {
"web.assets_backend": [
"barcode_gs1/static/src/js/gs1_nomenclature.esm.js",
"barcode_gs1/static/src/js/gs1_parser.esm.js",
"barcode_gs1/static/src/js/gs1_startup.esm.js",
"barcode_scanner.assets": [
"barcode_gs1/static/src/**/*.esm.js",
],
"web.assets_unit_tests": [
"barcode_gs1/static/tests/**/*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import {barcodeParsers} from "@barcode_scanner/js/registries.esm";
import {
compileGs1Rule,
getGs1Nomenclature,
hasValidCheckDigit,
} from "@barcode_gs1/js/gs1_nomenclature.esm";
} from "./gs1_nomenclature.esm";
import {barcodeParsers} from "@barcode_scanner/registries.esm";

const GS1_SEPARATOR = String.fromCharCode(29); // FNC1 (<GS>, 0x1D)
// FNC1 (<GS>, 0x1D)
const GS1_SEPARATOR = String.fromCharCode(29);

// The symbology identifiers the GS1 carriers prefix their data with: GS1-128,
// DataBar, GS1 DataMatrix, GS1 QR and GS1 DotCode. Their presence is itself
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {barcodeStartupTasks} from "@barcode_scanner/js/registries.esm";
import {loadGs1Nomenclature} from "@barcode_gs1/js/gs1_nomenclature.esm";
import {barcodeStartupTasks} from "@barcode_scanner/registries.esm";
import {loadGs1Nomenclature} from "./gs1_nomenclature.esm";

/**
* Read the GS1 nomenclature once, when the app starts, so the parser — which
Expand Down
6 changes: 3 additions & 3 deletions barcode_gs1/static/tests/gs1_parser.test.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/** @odoo-module **/

import {afterEach, describe, expect, test} from "@odoo/hoot";
import {gtinVariants, isGS1Barcode, parseGs1} from "@barcode_gs1/js/gs1_parser.esm";
import {gtinVariants, isGS1Barcode, parseGs1} from "@barcode_gs1/utils/gs1_parser.esm";
import {
compileGs1Nomenclature,
getGs1Nomenclature,
hasValidCheckDigit,
loadGs1Nomenclature,
setGs1Nomenclature,
} from "@barcode_gs1/js/gs1_nomenclature.esm";
import {parseBarcode} from "@barcode_scanner/js/barcode_parser.esm";
} from "@barcode_gs1/utils/gs1_nomenclature.esm";
import {parseBarcode} from "@barcode_scanner/utils/barcode_parser.esm";

// FNC1 (<GS>, 0x1D), the separator a scanner sends between variable-length AIs.
const GS = String.fromCharCode(29);
Expand Down
4 changes: 2 additions & 2 deletions barcode_gs1_stock/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"barcode_stock",
],
"assets": {
"web.assets_backend": [
"barcode_gs1_stock/static/src/js/gs1_stock_quantity.esm.js",
"barcode_scanner.assets": [
"barcode_gs1_stock/static/src/utils/gs1_stock_quantity.esm.js",
],
"web.assets_unit_tests": [
"barcode_gs1_stock/static/tests/**/*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {roundDecimals, roundPrecision} from "@web/core/utils/numbers";
import {BarcodeScannerState} from "@barcode_stock/js/services/barcode_scanner_state.esm";
import {barcodeStartupTasks} from "@barcode_scanner/js/registries.esm";
import {BarcodeScannerState} from "@barcode_stock/services/barcode_scanner_state.esm";
import {barcodeStartupTasks} from "@barcode_scanner/registries.esm";
import {patch} from "@web/core/utils/patch";

// Logistic measures (AI 330n-349n: the gross weight, dimensions and volume of
Expand Down
8 changes: 4 additions & 4 deletions barcode_gs1_stock/static/tests/gs1_stock_quantity.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import "@barcode_gs1_stock/js/gs1_stock_quantity.esm";
import "@barcode_gs1_stock/utils/gs1_stock_quantity.esm";
import {afterEach, describe, expect, test} from "@odoo/hoot";
import {
compileGs1Nomenclature,
setGs1Nomenclature,
} from "@barcode_gs1/js/gs1_nomenclature.esm";
import {BarcodeScannerState} from "@barcode_stock/js/services/barcode_scanner_state.esm";
import {parseGs1} from "@barcode_gs1/js/gs1_parser.esm";
} from "@barcode_gs1/utils/gs1_nomenclature.esm";
import {BarcodeScannerState} from "@barcode_stock/services/barcode_scanner_state.esm";
import {parseGs1} from "@barcode_gs1/utils/gs1_parser.esm";

// Units of measure as a stock database ships them: `factor` is how many of the
// unit make one unit of its category's reference (a kilogram is 1000 grams),
Expand Down
11 changes: 4 additions & 7 deletions barcode_inventory/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@
"stock_inventory",
],
"assets": {
"web.assets_backend": [
"barcode_inventory/static/src/scss/inventory.scss",
"barcode_inventory/static/src/xml/inventory_templates.xml",
"barcode_inventory/static/src/js/screens/inventory_location_screen.esm.js",
"barcode_inventory/static/src/js/screens/inventory_product_selector_screen.esm.js",
"barcode_inventory/static/src/js/screens/inventory_count_screen.esm.js",
"barcode_inventory/static/src/js/tiles/inventory_menu_tiles.esm.js",
"barcode_scanner.assets": [
"barcode_inventory/static/src/**/*.scss",
"barcode_inventory/static/src/**/*.esm.js",
"barcode_inventory/static/src/**/*.xml",
],
"web.assets_unit_tests": [
"barcode_inventory/static/tests/**/*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {Component, onWillStart, useState} from "@odoo/owl";
import {ConfirmationDialog} from "@web/core/confirmation_dialog/confirmation_dialog";
import {_t} from "@web/core/l10n/translation";
import {barcodeMatchAnyDomain} from "@barcode_scanner/js/utils/scan_match.esm";
import {barcodeScreens} from "@barcode_scanner/js/registries.esm";
import {barcodeMatchAnyDomain} from "@barcode_scanner/utils/scan_match.esm";
import {barcodeScreens} from "@barcode_scanner/registries.esm";
import {formatFloat} from "@web/core/utils/numbers";
import {useBarcodeHandler} from "@barcode_scanner/js/hooks/use_barcode_handler.esm";
import {useBarcodeScanner} from "@barcode_scanner/js/hooks/use_inventory.esm";
import {useBarcodeHandler} from "@barcode_scanner/hooks/use_barcode_handler.esm";
import {useBarcodeScanner} from "@barcode_scanner/hooks/use_inventory.esm";
import {useService} from "@web/core/utils/hooks";

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Difference between the counted quantity and the stock, under the count.
.ilx-inv-diff {
font-size: 0.8rem;
font-weight: 600;

&.ilx-inv-diff-up {
color: var(--ilx-success);
}

&.ilx-inv-diff-down {
color: var(--ilx-error);
}

&.ilx-inv-diff-none {
color: var(--ilx-on-surface-variant);
font-weight: normal;
}
}
Original file line number Diff line number Diff line change
@@ -1,77 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">

<t t-name="barcode_inventory.InventoryLocationScreen">
<div class="ilx-emp-v2-screen">
<header class="ilx-emp-v2-header">
<button class="ilx-emp-v2-back-btn" t-on-click="goBack">
<i class="fa fa-arrow-left" />
</button>
<h1 class="ilx-emp-v2-header-title">Inventory Adjustment</h1>
</header>

<main class="ilx-emp-v2-main">
<div t-if="!state.canApply" class="ilx-inv-no-access">
<i class="fa fa-lock" />
<span>Only inventory administrators can apply a count.</span>
</div>
<div t-else="" class="ilx-emp-v2-search-box">
<i class="fa fa-search ilx-emp-v2-search-icon" />
<input
type="text"
class="ilx-emp-v2-search-input"
placeholder="Scan or search a location..."
t-model="state.search"
/>
</div>

<h2
t-if="state.canApply"
class="ilx-emp-v2-section-title"
>SELECT A LOCATION TO COUNT</h2>
<div t-if="state.canApply" class="ilx-emp-v2-list">
<t t-if="state.loading">
<div class="text-center p-4">Loading locations...</div>
</t>
<t t-else="">
<t t-foreach="filteredLocations" t-as="loc" t-key="loc.id">
<div
class="ilx-emp-v2-card"
t-on-click="() => this.selectLocation(loc)"
>
<div class="ilx-emp-v2-avatar-wrapper">
<div class="ilx-emp-v2-avatar">
<div
class="ilx-emp-v2-avatar-placeholder"
style="background: #EAEAEA; color: #4A2B4D; font-size: 1.2rem;"
>
<i class="fa fa-map-marker" />
</div>
</div>
</div>
<div class="ilx-emp-v2-info">
<span class="ilx-emp-v2-name">
<t t-esc="loc.display_name" />
</span>
</div>
<div class="ilx-emp-v2-status">
<i
class="fa fa-chevron-right ilx-emp-v2-icon-chevron"
/>
</div>
</div>
</t>
<div
t-if="filteredLocations.length === 0"
class="text-center p-4"
style="color: #666;"
>No internal locations found.</div>
</t>
</div>
</main>
</div>
</t>

<t t-name="barcode_inventory.InventoryCountScreen">
<div class="ilx-emp-v2-screen">
<header class="ilx-emp-v2-header">
Expand Down Expand Up @@ -211,60 +139,4 @@
</footer>
</div>
</t>

<t t-name="barcode_inventory.InventoryProductSelectorScreen">
<div class="ilx-emp-v2-screen">
<header class="ilx-emp-v2-header">
<button class="ilx-emp-v2-back-btn" t-on-click="goBack">
<i class="fa fa-arrow-left" />
</button>
<h1 class="ilx-emp-v2-header-title">Add Product</h1>
</header>

<main class="ilx-emp-v2-main">
<div class="ilx-emp-v2-search-box">
<i class="fa fa-search ilx-emp-v2-search-icon" />
<input
type="text"
class="ilx-emp-v2-search-input"
placeholder="Scan or search a product..."
t-att-value="state.search"
t-on-input="onSearchInput"
/>
</div>

<h2 class="ilx-emp-v2-section-title">PRODUCTS</h2>
<div class="ilx-emp-v2-list">
<t t-if="state.loading">
<div class="text-center p-4">Loading products...</div>
</t>
<t t-else="">
<t t-foreach="state.results" t-as="prod" t-key="prod.id">
<div
class="ilx-emp-v2-card"
t-on-click="() => this.pickProduct(prod)"
>
<div class="ilx-emp-v2-info">
<span class="ilx-emp-v2-name">
<t t-esc="prod.display_name" />
</span>
</div>
<div class="ilx-emp-v2-status">
<i
class="fa fa-plus-circle ilx-emp-v2-icon-chevron"
/>
</div>
</div>
</t>
<div
t-if="state.results.length === 0"
class="text-center p-4"
style="color: #666;"
>No products found.</div>
</t>
</div>
</main>
</div>
</t>

</templates>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Component, onWillStart, useState} from "@odoo/owl";
import {_t} from "@web/core/l10n/translation";
import {barcodeMatchDomain} from "@barcode_scanner/js/utils/scan_match.esm";
import {barcodeScreens} from "@barcode_scanner/js/registries.esm";
import {useBarcodeHandler} from "@barcode_scanner/js/hooks/use_barcode_handler.esm";
import {useBarcodeScanner} from "@barcode_scanner/js/hooks/use_inventory.esm";
import {barcodeMatchDomain} from "@barcode_scanner/utils/scan_match.esm";
import {barcodeScreens} from "@barcode_scanner/registries.esm";
import {useBarcodeHandler} from "@barcode_scanner/hooks/use_barcode_handler.esm";
import {useBarcodeScanner} from "@barcode_scanner/hooks/use_inventory.esm";
import {useService} from "@web/core/utils/hooks";
import {user} from "@web/core/user";

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Shown instead of the locations to an operator who cannot apply a count.
.ilx-inv-no-access {
display: flex;
align-items: center;
gap: 10px;
padding: 12px 14px;
border-radius: 12px;
background: var(--ilx-warning-bg);
color: var(--ilx-on-surface);
font-size: 0.9rem;
}
Loading
Loading