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

[FW][IMP] point_of_sale: scan barcode with camera #163048

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 23, 2024

In this commit we add the ability to scan barcodes in pos using the integrated camera of the device.

We override the BarcodeDialog to permit the functionality of scanning multiple barcodes one after the other. Before, the dialog would close after a barcode was scanned. This can now be controlled a prop.

Task: 3878930


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #162651

@robodoo
Copy link
Contributor

robodoo commented Apr 23, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 23, 2024

@vlst-odoo @caburj cherrypicking of pull request #162651 failed.

stdout:

Auto-merging addons/point_of_sale/static/src/app/navbar/navbar.js
Auto-merging addons/point_of_sale/static/src/app/navbar/navbar.xml
Auto-merging addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
Auto-merging addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml
CONFLICT (modify/delete): addons/point_of_sale/static/src/app/store/models.js deleted in HEAD and modified in a588f1ae810e ([IMP] point_of_sale: scan barcode with camera).  Version a588f1ae810e ([IMP] point_of_sale: scan barcode with camera) of addons/point_of_sale/static/src/app/store/models.js left in tree.
Auto-merging addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.js
Auto-merging addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.xml
CONFLICT (content): Merge conflict in addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.xml

stderr:

19:19:07.077355 git.c:463               trace: built-in: git cherry-pick a588f1ae810eed967c9fe252151e41afbb326967
error: could not apply a588f1ae810e... [IMP] point_of_sale: scan barcode with camera
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 23, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 23, 2024
@vlst-odoo vlst-odoo force-pushed the master-saas-17.2-pos_self_order_camera_barcode-vlst-iz4y-fw branch from 8276193 to d2646c5 Compare April 24, 2024 09:10
@C3POdoo C3POdoo requested review from a team and adgu-odoo and removed request for a team April 24, 2024 09:12
@vlst-odoo vlst-odoo force-pushed the master-saas-17.2-pos_self_order_camera_barcode-vlst-iz4y-fw branch from d2646c5 to 9edff19 Compare April 24, 2024 09:13
In this commit we add the ability to scan barcodes in pos using the
integrated camera of the device.

We override the `BarcodeDialog` to permit the functionality of scanning
multiple barcodes one after the other. Before, the dialog would close
after a barcode was scanned. This can now be controlled a prop.

Task: 3878930
X-original-commit: a2caccb
@vlst-odoo vlst-odoo force-pushed the master-saas-17.2-pos_self_order_camera_barcode-vlst-iz4y-fw branch from 9edff19 to 1559a55 Compare April 24, 2024 11:33
@adgu-odoo adgu-odoo requested review from caburj and removed request for adgu-odoo April 24, 2024 14:12
@vlst-odoo
Copy link
Contributor

robodoo r+

robodoo pushed a commit that referenced this pull request Apr 25, 2024
In this commit we add the ability to scan barcodes in pos using the
integrated camera of the device.

We override the `BarcodeDialog` to permit the functionality of scanning
multiple barcodes one after the other. Before, the dialog would close
after a barcode was scanned. This can now be controlled a prop.

closes #163048

Task: 3878930
X-original-commit: a2caccb
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: Vlad Stroia (vlst) <vlst@odoo.com>
@robodoo robodoo added the 17.3 label Apr 25, 2024
@robodoo robodoo closed this Apr 25, 2024
zel-odoo pushed a commit to odoo-dev/odoo that referenced this pull request Apr 29, 2024
In this commit we add the ability to scan barcodes in pos using the
integrated camera of the device.

We override the `BarcodeDialog` to permit the functionality of scanning
multiple barcodes one after the other. Before, the dialog would close
after a barcode was scanned. This can now be controlled a prop.

closes odoo#163048

Task: 3878930
X-original-commit: a2caccb
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: Vlad Stroia (vlst) <vlst@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
17.3 conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants