diff --git a/edit_sale.php b/edit_sale.php index dcfde30..8714123 100644 --- a/edit_sale.php +++ b/edit_sale.php @@ -59,7 +59,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $lineTotal = $price * $qty; $vatPercent = (float) ($product['vat'] ?? 0); - $itemVat = $lineTotal - ($lineTotal / (1 + ($vatPercent / 100))); + $itemVat = $lineTotal * ($vatPercent / 100); $totalVat += $itemVat; $normalized[] = [ @@ -389,7 +389,7 @@ require __DIR__ . '/includes/header.php'; 0.000
- + 0.000
@@ -657,7 +657,7 @@ function renderInvoice() { const lineTotal = item.qty * item.price; const vatPercent = parseFloat(catalogData[sku].vat) || 0; - const itemVat = lineTotal - (lineTotal / (1 + (vatPercent / 100))); + const itemVat = lineTotal * (vatPercent / 100); totalVat += itemVat; totalAmount += lineTotal; @@ -688,10 +688,11 @@ function renderInvoice() { } function updateTotals(total, vat) { - const subtotal = total - vat; + const subtotal = total; + const finalTotal = subtotal + vat; document.getElementById('displaySubtotal').innerText = subtotal.toFixed(3); document.getElementById('displayVat').innerText = vat.toFixed(3); - document.getElementById('displayTotal').innerText = total.toFixed(3) + currencySuffix; + document.getElementById('displayTotal').innerText = finalTotal.toFixed(3) + currencySuffix; } renderInvoice(); diff --git a/includes/SimpleXLSX.php b/includes/SimpleXLSX.php new file mode 100644 index 0000000..292da12 --- /dev/null +++ b/includes/SimpleXLSX.php @@ -0,0 +1,1231 @@ +rows() as $r) { + * print_r( $r ); + * } + * } else { + * echo SimpleXLSX::parseError(); + * } + * + * Example 2: html table + * if ( $xlsx = SimpleXLSX::parse('book.xlsx') ) { + * echo $xlsx->toHTML(); + * } else { + * echo SimpleXLSX::parseError(); + * } + * + * Example 3: rowsEx + * $xlsx = SimpleXLSX::parse('book.xlsx'); + * foreach ( $xlsx->rowsEx() as $r ) { + * print_r( $r ); + * } + * + * Example 4: select worksheet + * $xlsx = SimpleXLSX::parse('book.xlsx'); + * foreach( $xlsx->rows(1) as $r ) { // second worksheet + * print_t( $r ); + * } + * + * Example 5: IDs and worksheet names + * $xlsx = SimpleXLSX::parse('book.xlsx'); + * print_r( $xlsx->sheetNames() ); // array( 0 => 'Sheet 1', 1 => 'Catalog' ); + * + * Example 6: get sheet name by index + * $xlsx = SimpleXLSX::parse('book.xlsx'); + * echo 'Sheet Name 2 = '.$xlsx->sheetName(1); + * + * Example 7: getCell (very slow) + * echo $xlsx->getCell(1,'D12'); // reads D12 cell from second sheet + * + * Example 8: read data + * if ( $xlsx = SimpleXLSX::parseData( file_get_contents('http://www.example.com/example.xlsx') ) ) { + * $dim = $xlsx->dimension(1); + * $num_cols = $dim[0]; + * $num_rows = $dim[1]; + * echo $xlsx->sheetName(1).':'.$num_cols.'x'.$num_rows; + * } else { + * echo SimpleXLSX::parseError(); + * } + * + * Example 9: old style + * $xlsx = new SimpleXLSX('book.xlsx'); + * if ( $xlsx->success() ) { + * print_r( $xlsx->rows() ); + * } else { + * echo 'xlsx error: '.$xlsx->error(); + * } + */ +class SimpleXLSX +{ + // Don't remove this string! Created by Sergey Shuchkin sergey.shuchkin@gmail.com + public static $CF = [ // Cell formats + 0 => 'General', + 1 => '0', + 2 => '0.00', + 3 => '#,##0', + 4 => '#,##0.00', + 9 => '0%', + 10 => '0.00%', + 11 => '0.00E+00', + 12 => '# ?/?', + 13 => '# ??/??', + 14 => 'mm-dd-yy', + 15 => 'd-mmm-yy', + 16 => 'd-mmm', + 17 => 'mmm-yy', + 18 => 'h:mm AM/PM', + 19 => 'h:mm:ss AM/PM', + 20 => 'h:mm', + 21 => 'h:mm:ss', + 22 => 'm/d/yy h:mm', + + 37 => '#,##0 ;(#,##0)', + 38 => '#,##0 ;[Red](#,##0)', + 39 => '#,##0.00;(#,##0.00)', + 40 => '#,##0.00;[Red](#,##0.00)', + + 44 => '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)', + 45 => 'mm:ss', + 46 => '[h]:mm:ss', + 47 => 'mmss.0', + 48 => '##0.0E+0', + 49 => '@', + + 27 => '[$-404]e/m/d', + 30 => 'm/d/yy', + 36 => '[$-404]e/m/d', + 50 => '[$-404]e/m/d', + 57 => '[$-404]e/m/d', + + 59 => 't0', + 60 => 't0.00', + 61 => 't#,##0', + 62 => 't#,##0.00', + 67 => 't0%', + 68 => 't0.00%', + 69 => 't# ?/?', + 70 => 't# ??/??', + ]; + public $nf = []; // number formats + public $cellFormats = []; // cellXfs + public $datetimeFormat = 'Y-m-d H:i:s'; + public $debug; + public $activeSheet = 0; + public $rowsExReader; + + /* @var SimpleXMLElement[] $sheets */ + public $sheets; + public $sheetFiles = []; + public $sheetMetaData = []; + public $sheetRels = []; + // scheme + public $styles; + /* @var array[] $package */ + public $package; + public $sharedstrings; + public $date1904 = 0; + + + /* + private $date_formats = array( + 0xe => "d/m/Y", + 0xf => "d-M-Y", + 0x10 => "d-M", + 0x11 => "M-Y", + 0x12 => "h:i a", + 0x13 => "h:i:s a", + 0x14 => "H:i", + 0x15 => "H:i:s", + 0x16 => "d/m/Y H:i", + 0x2d => "i:s", + 0x2e => "H:i:s", + 0x2f => "i:s.S" + ); + private $number_formats = array( + 0x1 => "%1.0f", // "0" + 0x2 => "%1.2f", // "0.00", + 0x3 => "%1.0f", //"#,##0", + 0x4 => "%1.2f", //"#,##0.00", + 0x5 => "%1.0f", //"$#,##0;($#,##0)", + 0x6 => '$%1.0f', //"$#,##0;($#,##0)", + 0x7 => '$%1.2f', //"$#,##0.00;($#,##0.00)", + 0x8 => '$%1.2f', //"$#,##0.00;($#,##0.00)", + 0x9 => '%1.0f%%', //"0%" + 0xa => '%1.2f%%', //"0.00%" + 0xb => '%1.2f', //"0.00E00", + 0x25 => '%1.0f', //"#,##0;(#,##0)", + 0x26 => '%1.0f', //"#,##0;(#,##0)", + 0x27 => '%1.2f', //"#,##0.00;(#,##0.00)", + 0x28 => '%1.2f', //"#,##0.00;(#,##0.00)", + 0x29 => '%1.0f', //"#,##0;(#,##0)", + 0x2a => '$%1.0f', //"$#,##0;($#,##0)", + 0x2b => '%1.2f', //"#,##0.00;(#,##0.00)", + 0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)", + 0x30 => '%1.0f'); //"##0.0E0"; + // }}} + */ + public $errno = 0; + public $error = false; + /** + * @var false|SimpleXMLElement + */ + public $theme; + + + public function __construct($filename = null, $is_data = null, $debug = null) + { + if ($debug !== null) { + $this->debug = $debug; + } + $this->package = [ + 'filename' => '', + 'mtime' => 0, + 'size' => 0, + 'comment' => '', + 'entries' => [] + ]; + if ($filename && $this->unzip($filename, $is_data)) { + $this->parseEntries(); + } + } + + public function unzip($filename, $is_data = false) + { + + if ($is_data) { + $this->package['filename'] = 'default.xlsx'; + $this->package['mtime'] = time(); + $this->package['size'] = self::strlen($filename); + + $vZ = $filename; + } else { + if (!is_readable($filename)) { + $this->error(1, 'File not found ' . $filename); + + return false; + } + + // Package information + $this->package['filename'] = $filename; + $this->package['mtime'] = filemtime($filename); + $this->package['size'] = filesize($filename); + + // Read file + $vZ = file_get_contents($filename); + } + // Cut end of central directory + /* $aE = explode("\x50\x4b\x05\x06", $vZ); + + if (count($aE) == 1) { + $this->error('Unknown format'); + return false; + } + */ + // Explode to each part + $aE = explode("\x50\x4b\x03\x04", $vZ); + array_shift($aE); + + $aEL = count($aE); + if ($aEL === 0) { + $this->error(2, 'Unknown archive format'); + + return false; + } + // Search central directory end record + $last = $aE[$aEL - 1]; + $last = explode("\x50\x4b\x05\x06", $last); + if (count($last) !== 2) { + $this->error(2, 'Unknown archive format'); + + return false; + } + // Search central directory + $last = explode("\x50\x4b\x01\x02", $last[0]); + if (count($last) < 2) { + $this->error(2, 'Unknown archive format'); + + return false; + } + $aE[$aEL - 1] = $last[0]; + + // Loop through the entries + foreach ($aE as $vZ) { + $aI = []; + $aI['E'] = 0; + $aI['EM'] = ''; + // Retrieving local file header information +// $aP = unpack('v1VN/v1GPF/v1CM/v1FT/v1FD/V1CRC/V1CS/V1UCS/v1FNL', $vZ); + $aP = unpack('v1VN/v1GPF/v1CM/v1FT/v1FD/V1CRC/V1CS/V1UCS/v1FNL/v1EFL', $vZ); + + // Check if data is encrypted +// $bE = ($aP['GPF'] && 0x0001) ? TRUE : FALSE; +// $bE = false; + $nF = $aP['FNL']; + $mF = $aP['EFL']; + + // Special case : value block after the compressed data + if ($aP['GPF'] & 0x0008) { + $aP1 = unpack('V1CRC/V1CS/V1UCS', self::substr($vZ, -12)); + + $aP['CRC'] = $aP1['CRC']; + $aP['CS'] = $aP1['CS']; + $aP['UCS'] = $aP1['UCS']; + // 2013-08-10 + $vZ = self::substr($vZ, 0, -12); + if (self::substr($vZ, -4) === "\x50\x4b\x07\x08") { + $vZ = self::substr($vZ, 0, -4); + } + } + + // Getting stored filename + $aI['N'] = self::substr($vZ, 26, $nF); + $aI['N'] = str_replace('\\', '/', $aI['N']); + + if (self::substr($aI['N'], -1) === '/') { + // is a directory entry - will be skipped + continue; + } + + // Truncate full filename in path and filename + $aI['P'] = dirname($aI['N']); + $aI['P'] = ($aI['P'] === '.') ? '' : $aI['P']; + $aI['N'] = basename($aI['N']); + + $vZ = self::substr($vZ, 26 + $nF + $mF); + + if ($aP['CS'] > 0 && (self::strlen($vZ) !== (int)$aP['CS'])) { // check only if availabled + $aI['E'] = 1; + $aI['EM'] = 'Compressed size is not equal with the value in header information.'; + } +// } elseif ( $bE ) { +// $aI['E'] = 5; +// $aI['EM'] = 'File is encrypted, which is not supported from this class.'; +/* } else { + switch ($aP['CM']) { + case 0: // Stored + // Here is nothing to do, the file ist flat. + break; + case 8: // Deflated + $vZ = gzinflate($vZ); + break; + case 12: // BZIP2 + if (extension_loaded('bz2')) { + $vZ = bzdecompress($vZ); + } else { + $aI['E'] = 7; + $aI['EM'] = 'PHP BZIP2 extension not available.'; + } + break; + default: + $aI['E'] = 6; + $aI['EM'] = "De-/Compression method {$aP['CM']} is not supported."; + } + if (!$aI['E']) { + if ($vZ === false) { + $aI['E'] = 2; + $aI['EM'] = 'Decompression of data failed.'; + } elseif ($this->_strlen($vZ) !== (int)$aP['UCS']) { + $aI['E'] = 3; + $aI['EM'] = 'Uncompressed size is not equal with the value in header information.'; + } elseif (crc32($vZ) !== $aP['CRC']) { + $aI['E'] = 4; + $aI['EM'] = 'CRC32 checksum is not equal with the value in header information.'; + } + } + } +*/ + + // DOS to UNIX timestamp + $aI['T'] = mktime( + ($aP['FT'] & 0xf800) >> 11, + ($aP['FT'] & 0x07e0) >> 5, + ($aP['FT'] & 0x001f) << 1, + ($aP['FD'] & 0x01e0) >> 5, + $aP['FD'] & 0x001f, + (($aP['FD'] & 0xfe00) >> 9) + 1980 + ); + + $this->package['entries'][] = [ + 'data' => $vZ, + 'ucs' => (int)$aP['UCS'], // ucompresses size + 'cm' => $aP['CM'], // compressed method + 'cs' => isset($aP['CS']) ? (int) $aP['CS'] : 0, // compresses size + 'crc' => $aP['CRC'], + 'error' => $aI['E'], + 'error_msg' => $aI['EM'], + 'name' => $aI['N'], + 'path' => $aI['P'], + 'time' => $aI['T'] + ]; + } // end for each entries + + return true; + } + + + public function error($num = null, $str = null) + { + if ($num) { + $this->errno = $num; + $this->error = $str; + if ($this->debug) { + trigger_error(__CLASS__ . ': ' . $this->error, E_USER_WARNING); + } + } + + return $this->error; + } + + public function parseEntries() + { + // Document data holders + $this->sharedstrings = []; + $this->sheets = []; +// $this->styles = array(); +// $m1 = 0; // memory_get_peak_usage( true ); + // Read relations and search for officeDocument + if ($relations = $this->getEntryXML('_rels/.rels')) { + foreach ($relations->Relationship as $rel) { + $rel_type = basename(trim((string)$rel['Type'])); // officeDocument + $rel_target = self::getTarget('', (string)$rel['Target']); // /xl/workbook.xml or xl/workbook.xml + + if ($rel_type === 'officeDocument' + && $workbook = $this->getEntryXML($rel_target) + ) { + $index_rId = []; // [0 => rId1] + + $index = 0; + foreach ($workbook->sheets->sheet as $s) { + $a = []; + foreach ($s->attributes() as $k => $v) { + $a[(string)$k] = (string)$v; + } + $this->sheetMetaData[$index] = $a; + $index_rId[$index] = (string)$s['id']; + $index++; + } + if ((int)$workbook->workbookPr['date1904'] === 1) { + $this->date1904 = 1; + } + + + if ($workbookRelations = $this->getEntryXML(dirname($rel_target) . '/_rels/workbook.xml.rels')) { + // Loop relations for workbook and extract sheets... + foreach ($workbookRelations->Relationship as $workbookRelation) { + $wrel_type = basename(trim((string)$workbookRelation['Type'])); // worksheet + $wrel_target = self::getTarget(dirname($rel_target), (string)$workbookRelation['Target']); + if (!$this->entryExists($wrel_target)) { + continue; + } + + if ($wrel_type === 'worksheet') { // Sheets + if ($sheet = $this->getEntryXML($wrel_target)) { + $index = array_search((string)$workbookRelation['Id'], $index_rId, true); + $this->sheets[$index] = $sheet; + $this->sheetFiles[$index] = $wrel_target; + $srel_d = dirname($wrel_target); + $srel_f = basename($wrel_target); + $srel_file = $srel_d . '/_rels/' . $srel_f . '.rels'; + if ($this->entryExists($srel_file)) { + $this->sheetRels[$index] = $this->getEntryXML($srel_file); + } + } + } elseif ($wrel_type === 'sharedStrings') { + if ($sharedStrings = $this->getEntryXML($wrel_target)) { + foreach ($sharedStrings->si as $val) { + if (isset($val->t)) { + $this->sharedstrings[] = (string)$val->t; + } elseif (isset($val->r)) { + $this->sharedstrings[] = self::parseRichText($val); + } + } + } + } elseif ($wrel_type === 'styles') { + $this->styles = $this->getEntryXML($wrel_target); + + // number formats + $this->nf = []; + if (isset($this->styles->numFmts->numFmt)) { + foreach ($this->styles->numFmts->numFmt as $v) { + $this->nf[(int)$v['numFmtId']] = (string)$v['formatCode']; + } + } + + $this->cellFormats = []; + if (isset($this->styles->cellXfs->xf)) { + foreach ($this->styles->cellXfs->xf as $v) { + $x = [ + 'format' => null + ]; + foreach ($v->attributes() as $k1 => $v1) { + $x[ $k1 ] = (int) $v1; + } + if (isset($x['numFmtId'])) { + if (isset($this->nf[$x['numFmtId']])) { + $x['format'] = $this->nf[$x['numFmtId']]; + } elseif (isset(self::$CF[$x['numFmtId']])) { + $x['format'] = self::$CF[$x['numFmtId']]; + } + } + + $this->cellFormats[] = $x; + } + } + } elseif ($wrel_type === 'theme') { + $this->theme = $this->getEntryXML($wrel_target); + } + } + +// break; + } + // reptile hack :: find active sheet from workbook.xml + if ($workbook->bookViews->workbookView) { + foreach ($workbook->bookViews->workbookView as $v) { + if (!empty($v['activeTab'])) { + $this->activeSheet = (int)$v['activeTab']; + } + } + } + + break; + } + } + } + +// $m2 = memory_get_peak_usage(true); +// echo __FUNCTION__.' M='.round( ($m2-$m1) / 1048576, 2).'MB'.PHP_EOL; + + if (count($this->sheets)) { + // Sort sheets + ksort($this->sheets); + + return true; + } + + return false; + } + + public function getEntryXML($name) + { + if ($entry_xml = $this->getEntryData($name)) { + $this->deleteEntry($name); // economy memory + // dirty remove namespace prefixes and empty rows + $entry_xml = preg_replace('/xmlns[^=]*="[^"]*"/i', '', $entry_xml); // remove namespaces + $entry_xml .= ' '; // force run garbage collector + // remove namespaced attrs + $entry_xml = preg_replace('/[a-zA-Z0-9]+:([a-zA-Z0-9]+="[^"]+")/', '$1', $entry_xml); + $entry_xml .= ' '; + $entry_xml = preg_replace('/<[a-zA-Z0-9]+:([^>]+)>/', '<$1>', $entry_xml); // fix namespaced openned tags + $entry_xml .= ' '; + $entry_xml = preg_replace('/<\/[a-zA-Z0-9]+:([^>]+)>/', '', $entry_xml); // fix namespaced closed tags + $entry_xml .= ' '; + + if (strpos($name, '/sheet')) { // dirty skip empty rows + // remove + $cnt = $cnt2 = $cnt3 = null; + $entry_xml = preg_replace('/]+>\s*(\s*)+<\/row>/', '', $entry_xml, -1, $cnt); + $entry_xml .= ' '; + // remove + $entry_xml = preg_replace('/]*\/>/', '', $entry_xml, -1, $cnt2); + $entry_xml .= ' '; + // remove + $entry_xml = preg_replace('/]*><\/row>/', '', $entry_xml, -1, $cnt3); + $entry_xml .= ' '; + if ($cnt || $cnt2 || $cnt3) { + $entry_xml = preg_replace('//', '', $entry_xml); + $entry_xml .= ' '; + } +// file_put_contents( basename( $name ), $entry_xml ); // @to do comment!!! + } + $entry_xml = trim($entry_xml); + +// $m1 = memory_get_usage(); + // XML External Entity (XXE) Prevention, libxml_disable_entity_loader deprecated in PHP 8 + if (LIBXML_VERSION < 20900 && function_exists('libxml_disable_entity_loader')) { + $_old = libxml_disable_entity_loader(); + } + + $_old_uie = libxml_use_internal_errors(true); + + $entry_xmlobj = simplexml_load_string($entry_xml, 'SimpleXMLElement', LIBXML_COMPACT | LIBXML_PARSEHUGE); + + libxml_use_internal_errors($_old_uie); + + if (LIBXML_VERSION < 20900 && function_exists('libxml_disable_entity_loader')) { + /** @noinspection PhpUndefinedVariableInspection */ + libxml_disable_entity_loader($_old); + } + +// $m2 = memory_get_usage(); +// echo round( ($m2-$m1) / (1024 * 1024), 2).' MB'.PHP_EOL; + + if ($entry_xmlobj) { + return $entry_xmlobj; + } + $e = libxml_get_last_error(); + if ($e) { + $this->error(3, 'XML-entry ' . $name . ' parser error ' . $e->message . ' line ' . $e->line); + } + } else { + $this->error(4, 'XML-entry not found ' . $name); + } + + return false; + } + + // sheets numeration: 1,2,3.... + + public function getEntryData($name) + { + $name = ltrim(str_replace('\\', '/', $name), '/'); + $dir = self::strtoupper(dirname($name)); + $name = self::strtoupper(basename($name)); + foreach ($this->package['entries'] as &$entry) { + if (self::strtoupper($entry['path']) === $dir && self::strtoupper($entry['name']) === $name) { + if ($entry['error']) { + return false; + } + switch ($entry['cm']) { + case -1: + case 0: // Stored + // Here is nothing to do, the file ist flat. + break; + case 8: // Deflated + $entry['data'] = gzinflate($entry['data']); + break; + case 12: // BZIP2 + if (extension_loaded('bz2')) { + $entry['data'] = bzdecompress($entry['data']); + } else { + $entry['error'] = 7; + $entry['error_message'] = 'PHP BZIP2 extension not available.'; + } + break; + default: + $entry['error'] = 6; + $entry['error_msg'] = 'De-/Compression method '.$entry['cm'].' is not supported.'; + } + if (!$entry['error'] && $entry['cm'] > -1) { + $entry['cm'] = -1; + if ($entry['data'] === false) { + $entry['error'] = 2; + $entry['error_msg'] = 'Decompression of data failed.'; + } elseif ($entry['ucs'] > 0 && (self::strlen($entry['data']) !== (int)$entry['ucs'])) { + $entry['error'] = 3; + $entry['error_msg'] = 'Uncompressed size is not equal with the value in header information.'; + } elseif (crc32($entry['data']) !== $entry['crc']) { + $entry['error'] = 4; + $entry['error_msg'] = 'CRC32 checksum is not equal with the value in header information.'; + } + } + + return $entry['data']; + } + } + unset($entry); + $this->error(5, 'Entry not found ' . ($dir ? $dir . '/' : '') . $name); + + return false; + } + public function deleteEntry($name) + { + $name = ltrim(str_replace('\\', '/', $name), '/'); + $dir = self::strtoupper(dirname($name)); + $name = self::strtoupper(basename($name)); + foreach ($this->package['entries'] as $k => $entry) { + if (self::strtoupper($entry['path']) === $dir && self::strtoupper($entry['name']) === $name) { + unset($this->package['entries'][$k]); + return true; + } + } + return false; + } + + public static function strtoupper($str) + { + return (ini_get('mbstring.func_overload') & 2) ? mb_strtoupper($str, '8bit') : strtoupper($str); + } + + /* + * @param string $name Filename in archive + * @return SimpleXMLElement|bool + */ + + public function entryExists($name) + { + // 0.6.6 + $dir = self::strtoupper(dirname($name)); + $name = self::strtoupper(basename($name)); + foreach ($this->package['entries'] as $entry) { + if (self::strtoupper($entry['path']) === $dir && self::strtoupper($entry['name']) === $name) { + return true; + } + } + + return false; + } + + public static function parseFile($filename, $debug = false) + { + return self::parse($filename, false, $debug); + } + + public static function parse($filename, $is_data = false, $debug = false) + { + $xlsx = new self(); + $xlsx->debug = $debug; + if ($xlsx->unzip($filename, $is_data)) { + $xlsx->parseEntries(); + } + if ($xlsx->success()) { + return $xlsx; + } + self::parseError($xlsx->error()); + self::parseErrno($xlsx->errno()); + + return false; + } + + public function success() + { + return !$this->error; + } + + // https://github.com/shuchkin/simplexlsx#gets-extend-cell-info-by--rowsex + + public static function parseError($set = false) + { + static $error = false; + + return $set ? $error = $set : $error; + } + + public static function parseErrno($set = false) + { + static $errno = false; + + return $set ? $errno = $set : $errno; + } + + public function errno() + { + return $this->errno; + } + + public static function parseData($data, $debug = false) + { + return self::parse($data, true, $debug); + } + + + + public function worksheet($worksheetIndex = 0) + { + if (isset($this->sheets[$worksheetIndex])) { + return $this->sheets[$worksheetIndex]; + } + $this->error(6, 'Worksheet not found ' . $worksheetIndex); + + return false; + } + + /** + * returns [numCols,numRows] of worksheet + * + * @param int $worksheetIndex + * + * @return array + */ + public function dimension($worksheetIndex = 0) + { + + if (($ws = $this->worksheet($worksheetIndex)) === false) { + return [0, 0]; + } + /* @var SimpleXMLElement $ws */ + + $ref = (string)$ws->dimension['ref']; + + if (self::strpos($ref, ':') !== false) { + $d = explode(':', $ref); + $idx = $this->getIndex($d[1]); + + return [$idx[0] + 1, $idx[1] + 1]; + } + /* + if ( $ref !== '' ) { // 0.6.8 + $index = $this->getIndex( $ref ); + + return [ $index[0] + 1, $index[1] + 1 ]; + } + */ + + // slow method + $maxC = $maxR = 0; + $iR = -1; + foreach ($ws->sheetData->row as $row) { + $iR++; + $iC = -1; + foreach ($row->c as $c) { + $iC++; + $idx = $this->getIndex((string)$c['r']); + $x = $idx[0]; + $y = $idx[1]; + if ($x > -1) { + if ($x > $maxC) { + $maxC = $x; + } + if ($y > $maxR) { + $maxR = $y; + } + } else { + if ($iC > $maxC) { + $maxC = $iC; + } + if ($iR > $maxR) { + $maxR = $iR; + } + } + } + } + + return [$maxC + 1, $maxR + 1]; + } + + public function getIndex($cell = 'A1') + { + $m = null; + + if (preg_match('/([A-Z]+)(\d+)/', $cell, $m)) { + $col = $m[1]; + $row = $m[2]; + + $colLen = self::strlen($col); + $index = 0; + + for ($i = $colLen - 1; $i >= 0; $i--) { + $index += (ord($col[$i]) - 64) * pow(26, $colLen - $i - 1); + } + + return [$index - 1, $row - 1]; + } + +// $this->error( 'Invalid cell index ' . $cell ); + + return [-1, -1]; + } + + public function value($cell) + { + // Determine data type + $dataType = (string)$cell['t']; + + if ($dataType === '' || $dataType === 'n') { // number + $s = (int)$cell['s']; + if ($s > 0 && isset($this->cellFormats[$s])) { + if (array_key_exists('format', $this->cellFormats[$s])) { + $format = $this->cellFormats[$s]['format']; + if ($format && preg_match('/[mM]/', preg_replace('/\"[^"]+\"/', '', $format))) { // [mm]onth,AM|PM + $dataType = 'D'; + } + } else { + $dataType = 'n'; + } + } + } + + $value = ''; + + switch ($dataType) { + case 's': + // Value is a shared string + if ((string)$cell->v !== '') { + $value = $this->sharedstrings[(int)$cell->v]; + } + break; + + case 'str': // formula? + if ((string)$cell->v !== '') { + $value = (string)$cell->v; + } + break; + + case 'b': + // Value is boolean + $value = self::boolean((string)$cell->v); + + break; + + case 'inlineStr': + // Value is rich text inline + $value = self::parseRichText($cell->is); + + break; + + case 'e': + // Value is an error message + if ((string)$cell->v !== '') { + $value = (string)$cell->v; + } + break; + + case 'D': + // Date as float + if (!empty($cell->v)) { + $value = $this->datetimeFormat ? + gmdate($this->datetimeFormat, $this->unixstamp((float)$cell->v)) : (float)$cell->v; + } + break; + + case 'd': + // Date as ISO YYYY-MM-DD + if ((string)$cell->v !== '') { + $value = (string)$cell->v; + } + break; + + default: + // Value is a string + $value = (string)$cell->v; + + // Check for numeric values + if (is_numeric($value)) { + /** @noinspection TypeUnsafeComparisonInspection */ + if ($value == (int)$value) { + $value = (int)$value; + } /** @noinspection TypeUnsafeComparisonInspection */ elseif ($value == (float)$value) { + $value = (float)$value; + } + } + } + + return $value; + } + + public function unixstamp($excelDateTime) + { + + $d = floor($excelDateTime); // days since 1900 or 1904 + $t = $excelDateTime - $d; + + if ($this->date1904) { + $d += 1462; + } + + $t = (abs($d) > 0) ? ($d - 25569) * 86400 + round($t * 86400) : round($t * 86400); + + return (int)$t; + } + + public function toHTML($worksheetIndex = 0) + { + $s = ''; + foreach ($this->readRows($worksheetIndex) as $r) { + $s .= ''; + foreach ($r as $c) { + $s .= ''; + } + $s .= "\r\n"; + } + $s .= '
' . ($c === '' ? ' ' : htmlspecialchars($c, ENT_QUOTES)) . '
'; + + return $s; + } + public function toHTMLEx($worksheetIndex = 0) + { + $s = ''; + $y = 0; + foreach ($this->readRowsEx($worksheetIndex) as $r) { + $s .= ''; + $x = 0; + foreach ($r as $c) { + $tag = 'td'; + $css = $c['css']; + if ($y === 0) { + $tag = 'th'; + $css .= $c['width'] ? 'width: '.round($c['width'] * 0.47, 2).'em;' : ''; + } + + if ($x === 0 && $c['height']) { + $css .= 'height: '.round($c['height'] * 1.3333).'px;'; + } + $s .= '<'.$tag.' style="'.$css.'" nowrap>' + . ($c['value'] === '' ? ' ' : htmlspecialchars($c['value'], ENT_QUOTES)) . ''; + $x++; + } + $s .= "\r\n"; + $y++; + } + $s .= '
'; + + return $s; + } + public function rows($worksheetIndex = 0, $limit = 0) + { + return iterator_to_array($this->readRows($worksheetIndex, $limit), false); + } + // thx Gonzo + /** + * @param $worksheetIndex + * @param $limit + * @return \Generator + */ + public function readRows($worksheetIndex = 0, $limit = 0) + { + + if (($ws = $this->worksheet($worksheetIndex)) === false) { + return; + } + $dim = $this->dimension($worksheetIndex); + $numCols = $dim[0]; + $numRows = $dim[1]; + + $emptyRow = []; + for ($i = 0; $i < $numCols; $i++) { + $emptyRow[] = ''; + } + + $curR = 0; + $_limit = $limit; + /* @var SimpleXMLElement $ws */ + foreach ($ws->sheetData->row as $row) { + $r = $emptyRow; + $curC = 0; + foreach ($row->c as $c) { + // detect skipped cols + $idx = $this->getIndex((string)$c['r']); + $x = $idx[0]; + $y = $idx[1]; + + if ($x > -1) { + $curC = $x; + while ($curR < $y) { + yield $emptyRow; + $curR++; + $_limit--; + if ($_limit === 0) { + return; + } + } + } + $r[$curC] = $this->value($c); + $curC++; + } + yield $r; + + $curR++; + $_limit--; + if ($_limit === 0) { + return; + } + } + while ($curR < $numRows) { + yield $emptyRow; + $curR++; + $_limit--; + if ($_limit === 0) { + return; + } + } + } + + public function rowsEx($worksheetIndex = 0, $limit = 0) + { + return iterator_to_array($this->readRowsEx($worksheetIndex, $limit), false); + } + // https://github.com/shuchkin/simplexlsx#gets-extend-cell-info-by--rowsex + /** + * @param $worksheetIndex + * @param $limit + * @return \Generator|null + */ + public function readRowsEx($worksheetIndex = 0, $limit = 0) + { + if (!$this->rowsExReader) { + require_once __DIR__ . '/SimpleXLSXEx.php'; + $this->rowsExReader = new SimpleXLSXEx($this); + } + return $this->rowsExReader->readRowsEx($worksheetIndex, $limit); + } + + /** + * Returns cell value + * VERY SLOW! Use ->rows() or ->rowsEx() + * + * @param int $worksheetIndex + * @param string|array $cell ref or coords, D12 or [3,12] + * + * @return mixed Returns NULL if not found + */ + public function getCell($worksheetIndex = 0, $cell = 'A1') + { + + if (($ws = $this->worksheet($worksheetIndex)) === false) { + return false; + } + if (is_array($cell)) { + $cell = self::num2name($cell[0]) . $cell[1];// [3,21] -> D21 + } + if (is_string($cell)) { + $result = $ws->sheetData->xpath("row/c[@r='" . $cell . "']"); + if (count($result)) { + return $this->value($result[0]); + } + } + + return null; + } + + public function getSheets() + { + return $this->sheets; + } + + public function sheetsCount() + { + return count($this->sheets); + } + + public function sheetName($worksheetIndex) + { + $sn = $this->sheetNames(); + if (isset($sn[$worksheetIndex])) { + return $sn[$worksheetIndex]; + } + + return false; + } + + public function sheetNames() + { + $a = []; + foreach ($this->sheetMetaData as $k => $v) { + $a[$k] = $v['name']; + } + return $a; + } + public function sheetMeta($worksheetIndex = null) + { + if ($worksheetIndex === null) { + return $this->sheetMetaData; + } + return isset($this->sheetMetaData[$worksheetIndex]) ? $this->sheetMetaData[$worksheetIndex] : false; + } + public function isHiddenSheet($worksheetIndex) + { + return isset($this->sheetMetaData[$worksheetIndex]['state']) + && $this->sheetMetaData[$worksheetIndex]['state'] === 'hidden'; + } + + public function getStyles() + { + return $this->styles; + } + + public function getPackage() + { + return $this->package; + } + + public function setDateTimeFormat($value) + { + $this->datetimeFormat = is_string($value) ? $value : false; + } + + public static function getTarget($base, $target) + { + $target = trim($target); + if (strpos($target, '/') === 0) { + return self::substr($target, 1); + } + $target = ($base ? $base . '/' : '') . $target; + // a/b/../c -> a/c + $parts = explode('/', $target); + $abs = []; + foreach ($parts as $p) { + if ('.' === $p) { + continue; + } + if ('..' === $p) { + array_pop($abs); + } else { + $abs[] = $p; + } + } + return implode('/', $abs); + } + + public static function parseRichText($is = null) + { + $value = []; + + if (isset($is->t)) { + $value[] = (string)$is->t; + } elseif (isset($is->r)) { + foreach ($is->r as $run) { + $value[] = (string)$run->t; + } + } + + return implode('', $value); + } + + public static function num2name($num) + { + $numeric = ($num - 1) % 26; + $letter = chr(65 + $numeric); + $num2 = (int)(($num - 1) / 26); + if ($num2 > 0) { + return self::num2name($num2) . $letter; + } + return $letter; + } + + public static function strlen($str) + { + return (ini_get('mbstring.func_overload') & 2) ? mb_strlen($str, '8bit') : strlen($str); + } + + public static function substr($str, $start, $length = null) + { + return (ini_get('mbstring.func_overload') & 2) ? + mb_substr($str, $start, ($length === null) ? mb_strlen($str, '8bit') : $length, '8bit') + : substr($str, $start, ($length === null) ? strlen($str) : $length); + } + + public static function strpos($haystack, $needle, $offset = 0) + { + return (ini_get('mbstring.func_overload') & 2) ? + mb_strpos($haystack, $needle, $offset, '8bit') : strpos($haystack, $needle, $offset); + } + public static function boolean($value) + { + if (is_numeric($value)) { + return (bool) $value; + } + + return $value === 'true' || $value === 'TRUE'; + } +} diff --git a/includes/app.php b/includes/app.php index a3aa425..25c4104 100644 --- a/includes/app.php +++ b/includes/app.php @@ -276,9 +276,9 @@ function create_sale(array $data): int ensure_sales_table(); $stmt = db()->prepare('INSERT INTO sales_orders - (receipt_no, sale_mode, branch_code, cashier_username, cashier_name, role_name, customer_name, payment_method, items_json, item_count, subtotal, total_amount, status, notes, sale_date) + (receipt_no, sale_mode, branch_code, cashier_username, cashier_name, role_name, customer_name, payment_method, items_json, item_count, subtotal, vat_amount, total_amount, status, notes, sale_date) VALUES - (:receipt_no, :sale_mode, :branch_code, :cashier_username, :cashier_name, :role_name, :customer_name, :payment_method, :items_json, :item_count, :subtotal, :total_amount, :status, :notes, NOW())'); + (:receipt_no, :sale_mode, :branch_code, :cashier_username, :cashier_name, :role_name, :customer_name, :payment_method, :items_json, :item_count, :subtotal, :vat_amount, :total_amount, :status, :notes, NOW())'); $stmt->bindValue(':receipt_no', $data['receipt_no']); $stmt->bindValue(':sale_mode', $data['sale_mode']); @@ -291,9 +291,9 @@ function create_sale(array $data): int $stmt->bindValue(':items_json', json_encode($data['items'], JSON_UNESCAPED_UNICODE)); $stmt->bindValue(':item_count', $data['item_count'], PDO::PARAM_INT); $stmt->bindValue(':subtotal', $data['subtotal']); + $stmt->bindValue(':vat_amount', $data['vat_amount'] ?? 0.0); $stmt->bindValue(':total_amount', $data['total_amount']); $stmt->bindValue(':status', $data['status'] ?? 'completed'); - $stmt->bindValue(':status', $data['status'] ?? 'completed'); $stmt->bindValue(':notes', $data['notes']); $stmt->execute(); @@ -415,6 +415,7 @@ function report_metrics(): array $paymentTotals = []; $productTotals = []; $gross = 0.0; + $totalVat = 0.0; foreach ($sales as $sale) { $branch = $sale['branch_code']; @@ -422,6 +423,7 @@ function report_metrics(): array $payment = $sale['payment_method']; $paymentTotals[$payment] = ($paymentTotals[$payment] ?? 0.0) + (float) $sale['total_amount']; $gross += (float) $sale['total_amount']; + $totalVat += (float) $sale['vat_amount']; foreach ($sale['items'] as $item) { $sku = (string) ($item['sku'] ?? ''); $qty = (int) ($item['qty'] ?? 0); @@ -435,6 +437,7 @@ function report_metrics(): array return [ 'gross' => $gross, + 'total_vat' => $totalVat, 'branch_totals' => $branchTotals, 'payment_totals' => $paymentTotals, 'product_totals' => $productTotals, @@ -467,6 +470,7 @@ function stock_snapshot(): array 'cost_price' => $item['cost_price'] ?? 0, 'category_id' => $item['category_id'], 'supplier_id' => $item['supplier_id'], + 'unit_id' => $item['unit_id'], 'image_url' => $item['image_url'], 'vat' => $item['vat'], ]; @@ -508,9 +512,9 @@ function create_purchase(array $data): int db()->beginTransaction(); try { $stmt = db()->prepare("INSERT INTO purchase_orders - (reference_no, branch_code, user_username, user_name, role_name, supplier_name, items_json, item_count, subtotal, total_amount, status, notes, purchase_date) + (reference_no, branch_code, user_username, user_name, role_name, supplier_name, items_json, item_count, subtotal, vat_amount, total_amount, status, notes, purchase_date) VALUES - (:reference_no, :branch_code, :user_username, :user_name, :role_name, :supplier_name, :items_json, :item_count, :subtotal, :total_amount, :status, :notes, NOW())"); + (:reference_no, :branch_code, :user_username, :user_name, :role_name, :supplier_name, :items_json, :item_count, :subtotal, :vat_amount, :total_amount, :status, :notes, NOW())"); $stmt->bindValue(":reference_no", $data["reference_no"]); $stmt->bindValue(":branch_code", $data["branch_code"]); @@ -521,6 +525,7 @@ function create_purchase(array $data): int $stmt->bindValue(":items_json", json_encode($data["items"], JSON_UNESCAPED_UNICODE)); $stmt->bindValue(":item_count", $data["item_count"], PDO::PARAM_INT); $stmt->bindValue(":subtotal", $data["subtotal"]); + $stmt->bindValue(":vat_amount", $data["vat_amount"] ?? 0.0); $stmt->bindValue(":total_amount", $data["total_amount"]); $stmt->bindValue(":status", $data["status"] ?? "completed"); $stmt->bindValue(":notes", $data["notes"]); diff --git a/includes/purchase_form.php b/includes/purchase_form.php index ff3f41d..21ae9de 100644 --- a/includes/purchase_form.php +++ b/includes/purchase_form.php @@ -32,6 +32,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } else { $normalized = []; $subtotal = 0.0; + $totalVat = 0.0; + $globalVat = (float) get_setting('vat_percentage', 5); $itemCount = 0; foreach ($items as $item) { $sku = (string) ($item['sku'] ?? ''); @@ -51,6 +53,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'line_total' => $lineTotal, ]; $subtotal += $lineTotal; + $itemVat = $lineTotal * ($globalVat / 100); + $totalVat += $itemVat; $itemCount += $qty; } @@ -68,7 +72,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'items' => $normalized, 'item_count' => $itemCount, 'subtotal' => $subtotal, - 'total_amount' => $subtotal, + 'vat_amount' => $totalVat, + 'total_amount' => $subtotal + $totalVat, 'status' => $purchaseStatus, 'notes' => $notes !== '' ? $notes : null, ]); @@ -358,7 +363,7 @@ require __DIR__ . '/header.php';
- + 0.000
@@ -606,19 +611,22 @@ function renderInvoice() { if (skus.length === 0) { tbody.innerHTML = ''; tbody.appendChild(emptyRow); - updateTotals(0); + updateTotals(0, 0); cartJson.value = '[]'; return; } tbody.innerHTML = ''; let totalAmount = 0; + let totalVat = 0; + const globalVat = ; const cartData = []; skus.forEach(sku => { const item = invoiceItems[sku]; const lineTotal = item.qty * item.price; totalAmount += lineTotal; + totalVat += lineTotal * (globalVat / 100); cartData.push({ sku: item.sku, qty: item.qty, price: item.price }); const tr = document.createElement('tr'); @@ -643,13 +651,16 @@ function renderInvoice() { tbody.appendChild(tr); }); - updateTotals(totalAmount); + updateTotals(totalAmount, totalVat); cartJson.value = JSON.stringify(cartData); } -function updateTotals(total) { - document.getElementById('displaySubtotal').innerText = total.toFixed(3); - document.getElementById('displayTotal').innerText = total.toFixed(3) + currencySuffix; +function updateTotals(total, vat) { + const subtotal = total; + const finalTotal = subtotal + vat; + document.getElementById('displaySubtotal').innerText = subtotal.toFixed(3); + document.getElementById('displayVat').innerText = vat.toFixed(3); + document.getElementById('displayTotal').innerText = finalTotal.toFixed(3) + currencySuffix; } // Intercept form submission to check if items exist diff --git a/includes/sale_form.php b/includes/sale_form.php index 860bb8b..e7b04c2 100644 --- a/includes/sale_form.php +++ b/includes/sale_form.php @@ -45,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $vatPercent = (float) ($product['vat'] ?? 0); // Assuming price is inclusive of VAT: - $itemVat = $lineTotal - ($lineTotal / (1 + ($vatPercent / 100))); + $itemVat = $lineTotal * ($vatPercent / 100); $totalVat += $itemVat; $normalized[] = [ @@ -77,9 +77,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'payment_method' => $paymentMethod, 'items' => $normalized, 'item_count' => $itemCount, - 'subtotal' => $subtotal - $totalVat, + 'subtotal' => $subtotal, 'vat_amount' => $totalVat, - 'total_amount' => $subtotal, + 'total_amount' => $subtotal + $totalVat, 'status' => $saleStatus, 'notes' => $notes !== '' ? $notes : null, ]); @@ -370,7 +370,7 @@ require __DIR__ . '/header.php'; 0.000
- + 0.000
@@ -626,7 +626,7 @@ function renderInvoice() { const lineTotal = item.qty * item.price; const vatPercent = parseFloat(catalogData[sku].vat) || 0; - const itemVat = lineTotal - (lineTotal / (1 + (vatPercent / 100))); + const itemVat = lineTotal * (vatPercent / 100); totalVat += itemVat; totalAmount += lineTotal; @@ -657,10 +657,11 @@ function renderInvoice() { } function updateTotals(total, vat) { - const subtotal = total - vat; + const subtotal = total; + const finalTotal = subtotal + vat; document.getElementById('displaySubtotal').innerText = subtotal.toFixed(3); document.getElementById('displayVat').innerText = vat.toFixed(3); - document.getElementById('displayTotal').innerText = total.toFixed(3) + currencySuffix; + document.getElementById('displayTotal').innerText = finalTotal.toFixed(3) + currencySuffix; } // Intercept form submission to check if items exist diff --git a/patch_export.php b/patch_export.php new file mode 100644 index 0000000..17e0445 --- /dev/null +++ b/patch_export.php @@ -0,0 +1,13 @@ +beginTransaction(); + try { + $stmtInsert = $pdo->prepare("INSERT INTO items (sku, name, price, cost_price, base_stock, vat, category_id, supplier_id, unit_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); + $stmtUpdate = $pdo->prepare("UPDATE items SET name=?, price=?, cost_price=?, base_stock=?, vat=?, category_id=?, supplier_id=?, unit_id=? WHERE sku=?"); + $stmtCheck = $pdo->prepare("SELECT id FROM items WHERE sku=?"); + while (($row = fgetcsv($file)) !== false) { +REPLACE; + +$replace = <<<'REPLACE' + if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) { + $pdo = db(); + $file_path = $_FILES['csv_file']['tmp_name']; + $raw_content = file_get_contents($file_path); + + // Prevent ZIP / XLSX + if (str_starts_with($raw_content, 'PK')) { + header('Location: stock.php?import_error=' . urlencode('يرجى حفظ الملف بصيغة CSV وليس كملف إكسل (XLSX)')); + exit; + } + + // Remove UTF-8 BOM if present + if (str_starts_with($raw_content, "\xEF\xBB\xBF")) { + $raw_content = substr($raw_content, 3); + } + + // Fix encoding for Windows-1256 (common in Arabic Excel exports) + if (!mb_check_encoding($raw_content, 'UTF-8')) { + $raw_content = mb_convert_encoding($raw_content, 'UTF-8', 'Windows-1256'); + } + + // Determine delimiter by checking first line + $first_line = strtok($raw_content, "\r\n"); + $delimiter = ','; + if ($first_line !== false && substr_count($first_line, ';') > substr_count($first_line, ',')) { + $delimiter = ';'; + } + + $clean_file = tmpfile(); + fwrite($clean_file, $raw_content); + rewind($clean_file); + + $header = fgetcsv($clean_file, 0, $delimiter); + $imported = 0; $updated = 0; + $pdo->beginTransaction(); + try { + $stmtInsert = $pdo->prepare("INSERT INTO items (sku, name, price, cost_price, base_stock, vat, category_id, supplier_id, unit_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); + $stmtUpdate = $pdo->prepare("UPDATE items SET name=?, price=?, cost_price=?, base_stock=?, vat=?, category_id=?, supplier_id=?, unit_id=? WHERE sku=?"); + $stmtCheck = $pdo->prepare("SELECT id FROM items WHERE sku=?"); + while (($row = fgetcsv($clean_file, 0, $delimiter)) !== false) { +REPLACE; + +if (strpos($content, $search) !== false) { + $content = str_replace($search, $replace, $content); + file_put_contents('stock.php', $content); + echo "Replaced successfully.\n"; +} else { + echo "Search string not found.\n"; +} + diff --git a/patch_import.py b/patch_import.py new file mode 100644 index 0000000..a7c1080 --- /dev/null +++ b/patch_import.py @@ -0,0 +1,118 @@ +import re + +with open("stock.php", "r", encoding="utf-8") as f: + content = f.read() + +# Replace block from `// Handle Import CSV` to `// Handle AJAX actions` +start_marker = "// Handle Import CSV" +end_marker = "// Handle AJAX actions" +start_idx = content.find(start_marker) +end_idx = content.find(end_marker) + +if start_idx == -1 or end_idx == -1: + print("Could not find import_csv block") + exit(1) + +new_import_code = """// Handle Import CSV +if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'import_csv') { + if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) { + require_once __DIR__ . '/includes/SimpleXLSX.php'; + $pdo = db(); + $file_path = $_FILES['csv_file']['tmp_name']; + $raw_content = file_get_contents($file_path); + + $rows = []; + # Check if XLSX (starts with PK) + if (str_starts_with($raw_content, 'PK')) { + if ( $xlsx = Shuchkin\SimpleXLSX::parse($file_path) ) { + $rows = $xlsx->rows(); + if (count($rows) > 0) { + array_shift($rows); # Remove header + } + } else { + header('Location: stock.php?import_error=' . urlencode('خطأ في قراءة ملف الإكسل (XLSX). يرجى التأكد من أن الملف سليم.')); + exit; + } + } else { + # Treat as CSV + # Remove UTF-8 BOM if present + if (str_starts_with($raw_content, "\xEF\xBB\xBF")) { + $raw_content = substr($raw_content, 3); + } + + # Fix encoding for Windows-1256 (common in Arabic Excel exports) + if (!mb_check_encoding($raw_content, 'UTF-8')) { + $raw_content = mb_convert_encoding($raw_content, 'UTF-8', 'Windows-1256'); + } + + # Determine delimiter by checking first line + $first_line = strtok($raw_content, "\r\n"); + $delimiter = ','; + if ($first_line !== false && substr_count($first_line, ';') > substr_count($first_line, ',')) { + $delimiter = ';'; + } + + $clean_file = tmpfile(); + fwrite($clean_file, $raw_content); + rewind($clean_file); + + $header = fgetcsv($clean_file, 0, $delimiter); + while (($row = fgetcsv($clean_file, 0, $delimiter)) !== false) { + $rows[] = $row; + } + fclose($clean_file); + } + + $imported = 0; $updated = 0; + $pdo->beginTransaction(); + try { + $stmtInsert = $pdo->prepare("INSERT INTO items (sku, name, price, cost_price, base_stock, vat, category_id, supplier_id, unit_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); + $stmtUpdate = $pdo->prepare("UPDATE items SET name=?, price=?, cost_price=?, base_stock=?, vat=?, category_id=?, supplier_id=?, unit_id=? WHERE sku=?"); + $stmtCheck = $pdo->prepare("SELECT id FROM items WHERE sku=?"); + + foreach ($rows as $row) { + if (count($row) < 5) continue; + $sku = trim((string)$row[0]); $name = trim((string)$row[1]); + if ($sku === '' || $name === '') continue; + $price = (float)($row[2] ?? 0); + $cost_price = (float)($row[3] ?? 0); + $base_stock = (int)($row[4] ?? 0); + $vat = (float)($row[5] ?? 5); + $category_id = !empty($row[6]) ? (int)$row[6] : null; + $supplier_id = !empty($row[7]) ? (int)$row[7] : null; + $unit_id = !empty($row[8]) ? (int)$row[8] : null; + $stmtCheck->execute([$sku]); + if ($stmtCheck->fetchColumn()) { + $stmtUpdate->execute([$name, $price, $cost_price, $base_stock, $vat, $category_id, $supplier_id, $unit_id, $sku]); + $updated++; + } else { + $stmtInsert->execute([$sku, $name, $price, $cost_price, $base_stock, $vat, $category_id, $supplier_id, $unit_id]); + $imported++; + } + } + $pdo->commit(); + header('Location: stock.php?import_success=1&imported='.$imported.'&updated='.$updated); + exit; + } catch (Exception $e) { + $pdo->rollBack(); + header('Location: stock.php?import_error='.urlencode($e->getMessage())); + exit; + } + } + header('Location: stock.php?import_error=No+file'); + exit; +} + +""" + +content = content[:start_idx] + new_import_code + content[end_idx:] + +# Update the modal text to reflect XLSX support +content = content.replace("ملاحظة: يدعم النظام ملفات CSV فقط. يرجى حفظ ملف Excel بصيغة (CSV UTF-8).", "ملاحظة: يدعم النظام الآن ملفات Excel (XLSX) بالإضافة إلى CSV.") +content = content.replace("Note: The system supports CSV files only. Please save your Excel file as (CSV UTF-8).", "Note: The system now supports Excel (XLSX) files in addition to CSV.") +content = content.replace('accept=".csv"', 'accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"') + +with open("stock.php", "w", encoding="utf-8") as f: + f.write(content) + +print("Patched successfully") diff --git a/patch_import_fk.py b/patch_import_fk.py new file mode 100644 index 0000000..d718e4b --- /dev/null +++ b/patch_import_fk.py @@ -0,0 +1,31 @@ +import re + +with open("stock.php", "r") as f: + content = f.read() + +replacement = """ $valid_categories = $pdo->query("SELECT id FROM categories")->fetchAll(PDO::FETCH_COLUMN); + $valid_suppliers = $pdo->query("SELECT id FROM suppliers")->fetchAll(PDO::FETCH_COLUMN); + $valid_units = $pdo->query("SELECT id FROM units")->fetchAll(PDO::FETCH_COLUMN); + + foreach ($rows as $row) { + if (count($row) < 5) continue; + $sku = trim((string)$row[0]); $name = trim((string)$row[1]); + if ($sku === '' || $name === '') continue; + $price = (float)($row[2] ?? 0); + $cost_price = (float)($row[3] ?? 0); + $base_stock = (int)($row[4] ?? 0); + $vat = (float)($row[5] ?? 5); + $category_id = (!empty($row[6]) && in_array((int)$row[6], $valid_categories)) ? (int)$row[6] : null; + $supplier_id = (!empty($row[7]) && in_array((int)$row[7], $valid_suppliers)) ? (int)$row[7] : null; + $unit_id = (!empty($row[8]) && in_array((int)$row[8], $valid_units)) ? (int)$row[8] : null;""" + +pattern = r" foreach \(\$rows as \$row\) \{[^\}]+?\$unit_id = !empty\(\$row\[8\]\) \? \(int\)\$row\[8\] : null;" + +new_content = re.sub(pattern, replacement, content, flags=re.DOTALL) + +if replacement in new_content: + with open("stock.php", "w") as f: + f.write(new_content) + print("Success") +else: + print("Failed") \ No newline at end of file diff --git a/pos.php b/pos.php index 1a08240..2694133 100644 --- a/pos.php +++ b/pos.php @@ -34,6 +34,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } else { $normalized = []; $subtotal = 0.0; + $totalVat = 0.0; $itemCount = 0; foreach ($items as $item) { $sku = (string) ($item['sku'] ?? ''); @@ -53,6 +54,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'line_total' => $lineTotal, ]; $subtotal += $lineTotal; + $vatPercent = (float) ($product['vat'] ?? 0); + $itemVat = $lineTotal * ($vatPercent / 100); + $totalVat += $itemVat; $itemCount += $qty; } @@ -72,7 +76,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'items' => $normalized, 'item_count' => $itemCount, 'subtotal' => $subtotal, - 'total_amount' => $subtotal, + 'vat_amount' => $totalVat, + 'total_amount' => $subtotal + $totalVat, 'notes' => $notes !== '' ? $notes : null, ]); @@ -433,6 +438,10 @@ require __DIR__ . '/includes/header.php'; 0.000
+
+ + 0.000 +
0.000 @@ -694,6 +703,7 @@ function renderCart() { const list = document.getElementById('cartItemsList'); const badge = document.getElementById('cartBadgeCount'); const subVal = document.getElementById('cartSubtotalVal'); + const vatVal = document.getElementById('cartVatVal'); const totalVal = document.getElementById('cartTotalVal'); const btnPay = document.getElementById('btnPay'); const btnHold = document.getElementById('btnHold'); @@ -702,6 +712,7 @@ function renderCart() { list.innerHTML = ''; let total = 0; let count = 0; + let totalVat = 0; const skus = Object.keys(cart); if (skus.length === 0) { @@ -713,6 +724,7 @@ function renderCart() { `; badge.innerText = '0'; subVal.innerText = `0.000 ${currencyLabel}`; + vatVal.innerText = `0.000`; totalVal.innerText = `0.000 ${currencyLabel}`; btnPay.disabled = true; btnHold.disabled = true; @@ -723,6 +735,9 @@ function renderCart() { skus.forEach(sku => { const item = cart[sku]; const lineTotal = item.price * item.qty; + const vatPercent = parseFloat(catalogData[sku].vat) || 0; + const itemVat = lineTotal * (vatPercent / 100); + totalVat += itemVat; total += lineTotal; count += item.qty; @@ -746,8 +761,11 @@ function renderCart() { }); badge.innerText = count; - const totalStr = `${total.toFixed(3)} ${currencyLabel}`; - subVal.innerText = totalStr; + const subtotal = total; + const finalTotal = subtotal + totalVat; + const totalStr = `${finalTotal.toFixed(3)} ${currencyLabel}`; + subVal.innerText = subtotal.toFixed(3) + ' ' + currencyLabel; + vatVal.innerText = totalVat.toFixed(3); totalVal.innerText = totalStr; document.getElementById('modalTotalAmount').innerText = totalStr; diff --git a/print_receipt.php b/print_receipt.php index 5bc9c1b..2afc7b6 100644 --- a/print_receipt.php +++ b/print_receipt.php @@ -248,7 +248,7 @@ $registerNo = 'REG-01';
- +
diff --git a/purchases.php b/purchases.php index 30907f1..0bbff01 100644 --- a/purchases.php +++ b/purchases.php @@ -70,6 +70,8 @@ require __DIR__ . '/includes/header.php'; + + @@ -85,7 +87,9 @@ require __DIR__ . '/includes/header.php'; - + + + diff --git a/reports.php b/reports.php index 71dacd3..0b8c31a 100644 --- a/reports.php +++ b/reports.php @@ -142,13 +142,19 @@ require __DIR__ . '/includes/header.php'; + + @@ -164,6 +170,8 @@ require __DIR__ . '/includes/header.php'; + + @@ -171,6 +179,8 @@ require __DIR__ . '/includes/header.php'; + + @@ -263,9 +273,10 @@ require __DIR__ . '/includes/header.php';
-
-
-
+
+
+
+
diff --git a/sale.php b/sale.php index 1694052..18613ec 100644 --- a/sale.php +++ b/sale.php @@ -424,7 +424,7 @@ require __DIR__ . '/includes/header.php'; - + diff --git a/sales.php b/sales.php index f0bc86c..36724cb 100644 --- a/sales.php +++ b/sales.php @@ -131,6 +131,8 @@ require __DIR__ . '/includes/header.php'; + + @@ -148,7 +150,9 @@ require __DIR__ . '/includes/header.php'; - + + + diff --git a/stock.php b/stock.php index 68bb7d0..9e3d87e 100644 --- a/stock.php +++ b/stock.php @@ -12,7 +12,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['action']) && $_GET['act $items = $stmt->fetchAll(PDO::FETCH_ASSOC); header('Content-Type: text/csv; charset=utf-8'); header('Content-Disposition: attachment; filename=stock_export_' . date('Ymd_His') . '.csv'); - echo ""; + echo "\xEF\xBB\xBF"; $output = fopen('php://output', 'w'); fputcsv($output, ['SKU', 'Name', 'Price', 'Cost Price', 'Stock', 'VAT', 'Category ID', 'Supplier ID', 'Unit ID']); foreach ($items as $row) { fputcsv($output, $row); } @@ -23,28 +23,76 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['action']) && $_GET['act // Handle Import CSV if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'import_csv') { if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) { + require_once __DIR__ . '/includes/SimpleXLSX.php'; $pdo = db(); - $file = fopen($_FILES['csv_file']['tmp_name'], 'r'); - $bom = fread($file, 3); - if ($bom !== "") rewind($file); - $header = fgetcsv($file); + $file_path = $_FILES['csv_file']['tmp_name']; + $raw_content = file_get_contents($file_path); + + $rows = []; + # Check if XLSX (starts with PK) + if (str_starts_with($raw_content, 'PK')) { + if ( $xlsx = Shuchkin\SimpleXLSX::parse($file_path) ) { + $rows = $xlsx->rows(); + if (count($rows) > 0) { + array_shift($rows); # Remove header + } + } else { + header('Location: stock.php?import_error=' . urlencode('خطأ في قراءة ملف الإكسل (XLSX). يرجى التأكد من أن الملف سليم.')); + exit; + } + } else { + # Treat as CSV + # Remove UTF-8 BOM if present + if (str_starts_with($raw_content, "")) { + $raw_content = substr($raw_content, 3); + } + + # Fix encoding for Windows-1256 (common in Arabic Excel exports) + if (!mb_check_encoding($raw_content, 'UTF-8')) { + $raw_content = mb_convert_encoding($raw_content, 'UTF-8', 'Windows-1256'); + } + + # Determine delimiter by checking first line + $first_line = strtok($raw_content, " +"); + $delimiter = ','; + if ($first_line !== false && substr_count($first_line, ';') > substr_count($first_line, ',')) { + $delimiter = ';'; + } + + $clean_file = tmpfile(); + fwrite($clean_file, $raw_content); + rewind($clean_file); + + $header = fgetcsv($clean_file, 0, $delimiter); + while (($row = fgetcsv($clean_file, 0, $delimiter)) !== false) { + $rows[] = $row; + } + fclose($clean_file); + } + $imported = 0; $updated = 0; $pdo->beginTransaction(); try { $stmtInsert = $pdo->prepare("INSERT INTO items (sku, name, price, cost_price, base_stock, vat, category_id, supplier_id, unit_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); $stmtUpdate = $pdo->prepare("UPDATE items SET name=?, price=?, cost_price=?, base_stock=?, vat=?, category_id=?, supplier_id=?, unit_id=? WHERE sku=?"); $stmtCheck = $pdo->prepare("SELECT id FROM items WHERE sku=?"); - while (($row = fgetcsv($file)) !== false) { + + $valid_categories = $pdo->query("SELECT id FROM categories")->fetchAll(PDO::FETCH_COLUMN); + $valid_suppliers = $pdo->query("SELECT id FROM suppliers")->fetchAll(PDO::FETCH_COLUMN); + $valid_units = $pdo->query("SELECT id FROM units")->fetchAll(PDO::FETCH_COLUMN); + + foreach ($rows as $row) { if (count($row) < 5) continue; - $sku = trim($row[0]); $name = trim($row[1]); + $sku = trim((string)$row[0]); $name = trim((string)$row[1]); if ($sku === '' || $name === '') continue; $price = (float)($row[2] ?? 0); $cost_price = (float)($row[3] ?? 0); $base_stock = (int)($row[4] ?? 0); $vat = (float)($row[5] ?? 5); - $category_id = !empty($row[6]) ? (int)$row[6] : null; - $supplier_id = !empty($row[7]) ? (int)$row[7] : null; - $unit_id = !empty($row[8]) ? (int)$row[8] : null; + $category_id = (!empty($row[6]) && in_array((int)$row[6], $valid_categories)) ? (int)$row[6] : null; + $supplier_id = (!empty($row[7]) && in_array((int)$row[7], $valid_suppliers)) ? (int)$row[7] : null; + $unit_id = (!empty($row[8]) && in_array((int)$row[8], $valid_units)) ? (int)$row[8] : null; $stmtCheck->execute([$sku]); if ($stmtCheck->fetchColumn()) { $stmtUpdate->execute([$name, $price, $cost_price, $base_stock, $vat, $category_id, $supplier_id, $unit_id, $sku]); @@ -285,7 +333,7 @@ require __DIR__ . '/includes/header.php'; SKU - + @@ -314,7 +362,7 @@ require __DIR__ . '/includes/header.php';
- + @@ -370,7 +418,7 @@ require __DIR__ . '/includes/header.php';
- +


@@ -378,7 +426,7 @@ require __DIR__ . '/includes/header.php';

- +