diff --git a/package-lock.json b/package-lock.json index 42dcc5e..d809984 100644 --- a/package-lock.json +++ b/package-lock.json @@ -170,7 +170,8 @@ "video-react": "^0.15.0", "web-vitals": "^2.1.4", "webpack-bundle-analyzer": "^4.5.0", - "wysiwyg": "^2.0.0" + "wysiwyg": "^2.0.0", + "xlsx": "^0.18.5" } }, "node_modules/@adobe/css-tools": { @@ -8356,6 +8357,14 @@ "node": ">=8.9" } }, + "node_modules/adler-32": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", + "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/aes-decrypter": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz", @@ -9927,6 +9936,18 @@ "node": ">=4" } }, + "node_modules/cfb": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz", + "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", + "dependencies": { + "adler-32": "~1.3.0", + "crc-32": "~1.2.0" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -10263,6 +10284,14 @@ "node": ">=4" } }, + "node_modules/codepage": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", + "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -10647,6 +10676,17 @@ "node": ">=10" } }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -14827,6 +14867,14 @@ "node": ">= 0.6" } }, + "node_modules/frac": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/fraction.js": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", @@ -29956,6 +30004,17 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, + "node_modules/ssf": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz", + "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", + "dependencies": { + "frac": "~1.1.2" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/ssri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", @@ -33386,6 +33445,22 @@ "es6-promise": "^3.1.2" } }, + "node_modules/wmf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz", + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/word": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz", + "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -33836,6 +33911,26 @@ "pubsub": "^1.0.2" } }, + "node_modules/xlsx": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz", + "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", + "dependencies": { + "adler-32": "~1.3.0", + "cfb": "~1.2.1", + "codepage": "~1.15.0", + "crc-32": "~1.2.1", + "ssf": "~0.11.2", + "wmf": "~1.0.1", + "word": "~0.3.0" + }, + "bin": { + "xlsx": "bin/xlsx.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -39823,6 +39918,11 @@ "regex-parser": "^2.2.11" } }, + "adler-32": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", + "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==" + }, "aes-decrypter": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz", @@ -41045,6 +41145,15 @@ "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz", "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==" }, + "cfb": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz", + "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", + "requires": { + "adler-32": "~1.3.0", + "crc-32": "~1.2.0" + } + }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -41306,6 +41415,11 @@ } } }, + "codepage": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", + "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==" + }, "collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -41621,6 +41735,11 @@ "yaml": "^1.10.0" } }, + "crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==" + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -44771,6 +44890,11 @@ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, + "frac": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==" + }, "fraction.js": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", @@ -56238,6 +56362,14 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, + "ssf": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz", + "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", + "requires": { + "frac": "~1.1.2" + } + }, "ssri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", @@ -58894,6 +59026,16 @@ "es6-promise": "^3.1.2" } }, + "wmf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz", + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==" + }, + "word": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz", + "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==" + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -59277,6 +59419,20 @@ "pubsub": "^1.0.2" } }, + "xlsx": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz", + "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", + "requires": { + "adler-32": "~1.3.0", + "cfb": "~1.2.1", + "codepage": "~1.15.0", + "crc-32": "~1.2.1", + "ssf": "~0.11.2", + "wmf": "~1.0.1", + "word": "~0.3.0" + } + }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", diff --git a/package.json b/package.json index aaf3698..69b95a8 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,8 @@ "video-react": "^0.15.0", "web-vitals": "^2.1.4", "webpack-bundle-analyzer": "^4.5.0", - "wysiwyg": "^2.0.0" + "wysiwyg": "^2.0.0", + "xlsx": "^0.18.5" }, "scripts": { "start": "set \"GENERATE_SOURCEMAP=false\" && react-scripts --max_old_space_size=16384 start", diff --git a/src/components/ESign.js b/src/components/ESign.js index 98fd9b1..b389483 100644 --- a/src/components/ESign.js +++ b/src/components/ESign.js @@ -491,10 +491,10 @@ function ESign() {
- + - - + + diff --git a/src/components/Emarge_QR_Code.js b/src/components/Emarge_QR_Code.js index 3759d8e..2d2877f 100644 --- a/src/components/Emarge_QR_Code.js +++ b/src/components/Emarge_QR_Code.js @@ -604,12 +604,13 @@ function Emarge_QR_Code() {


- + - - - - + + + + +
diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js index bae791d..8aa311f 100644 --- a/src/components/Partner_Facture.js +++ b/src/components/Partner_Facture.js @@ -43,9 +43,71 @@ import DialogTitle from '@mui/material/DialogTitle'; import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; import { gridClasses } from '@mui/x-data-grid'; +import { + + GridToolbarContainer, + GridToolbarExportContainer, + GridCsvExportMenuItem, + useGridApiContext, + gridFilteredSortedRowIdsSelector, + gridVisibleColumnFieldsSelector, + GridToolbarExport, + } from '@mui/x-data-grid'; + +//import { utils, writeFileXLSX } from "xlsx"; + const Partner_Facture = (props) => { + const csvOptions = { delimiter: ';' }; + function CustomExportButton(props) { + return ( + + + + + ); + } + + + + function CustomToolbar() { + return ( + + + + ); + } + + + function gg() { + + /* const wb = utils.book_new(); + + console.log(" ### selectionModel = ", Getall_Parter_Invoice_No_Filter_result); + + var new_data2 = [] + const new_data = Getall_Parter_Invoice_No_Filter_result.map((x) => { + + //--- + + var local_node = JSON.parse(x); + console.log("### local_node = ", local_node); + + new_data2.push(local_node); + }); + + + console.log(" ### new_data2 = ", new_data2); + + + + utils.book_append_sheet(wb, utils.json_to_sheet(new_data2)); + + writeFileXLSX(wb, "testyy.xlsx");*/ + } + + const history = useHistory(); const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); @@ -101,16 +163,16 @@ const Partner_Facture = (props) => { const columns = [ - { field: '_id', headerName: '_id', hide: true }, - { field: 'id', headerName: 'id', hide: true }, + { field: '_id', headerName: '_id', hide: true, disableExport: true }, + { field: 'id', headerName: 'id', hide: true, disableExport: true }, { field: 'invoice_header_ref_interne', headerName: 'Num Facture', minWidth: 200, flex: 1, hide: false, editable: false }, { field: 'order_header_ref_interne', headerName: 'Reference Cmd', minWidth: 200, flex: 1, hide: false, editable: false }, { field: 'invoice_header_type', headerName: 'Type', width: 100, hide: false, editable: false }, { field: 'invoice_date', headerName: 'Date Facture', width: 150, hide: false, editable: false }, - { field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true, editable: false }, + { field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true, editable: false, disableExport: true }, { field: 'order_header_client_nom', headerName: 'Nom Client', minWidth: 150, flex: 1 }, - { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false }, + { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false, disableExport: true }, { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false }, { field: 'order_header_date_cmd', headerName: 'Date Cmd', width: 150, hide: true, editable: false }, { field: 'total_header_hors_taxe_after_header_reduction', headerName: 'Montant HT', width: 150, hide: false, editable: false }, @@ -562,7 +624,7 @@ const Partner_Facture = (props) => { if (new_data2.length > 0) { setNew_Getall_Invoice_Paiement_Payed_Remain_Amounts_result(new_data2); - // console.log(" ### new_data2 = ", new_data2) + // console.log(" ### new_data2 = ", new_data2) } } @@ -2971,9 +3033,11 @@ const Partner_Facture = (props) => {
+ + +
-
  { } }} + + onRowDoubleClick={(newSelectionModel) => { setgridline_id(newSelectionModel.row.id); @@ -3070,8 +3136,6 @@ const Partner_Facture = (props) => { order_header_tax_amount: JSON.parse(item).order_header_tax_amount, total_header_toutes_taxes: JSON.parse(item).total_header_toutes_taxes, - - order_header_client_id: JSON.parse(item).order_header_client_id, order_header_client_nom: JSON.parse(item).order_header_client_nom, order_header_vendeur_id: JSON.parse(item).order_header_vendeur_id, @@ -3093,8 +3157,10 @@ const Partner_Facture = (props) => { rowsPerPageOptions={[10]} //disableSelectionOnClick components={{ - Toolbar: GridToolbar, + Toolbar: GridToolbar, }} + + //sx={datagridSx} getCellClassName={(params) => { diff --git a/src/styles/components/_esign.scss b/src/styles/components/_esign.scss index 1dba39a..577a895 100644 --- a/src/styles/components/_esign.scss +++ b/src/styles/components/_esign.scss @@ -2491,6 +2491,8 @@ } + + } .css-1t1j96h-MuiPaper-root-MuiDialog-paper{ border-radius: 15px !important;