mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-09-13 13:57:34 -04:00
jekkosandobjecttothis
839821e2eb
* Validate gift-card payment amounts (GHSA-9847) Close the negative gift-card amount minting vector: when a forged payment_type like 'Gift Card:<number>' reaches the catch-all validation branch, a negative amount_tendered previously passed decimal_locale and was then routed into Giftcard::decrementGiftcardValue, where value - (-N) increased the balance (store credit minted at will). - Add nonNegativeDecimal rule + 'Sales.negative_amount_tendered' message to the catch-all amount_tendered rules in Sales::postAddPayment(); add the language key to all 46 locale files (populated in en, empty elsewhere). - Guard Giftcard::decrementGiftcardValue() against non-positive amounts so the sink itself can no longer add balance from an inverted subtraction. - Regression tests: controller-level rejection of negative amount_tendered and model-level rejection of negative/zero decrements. * Address PR review: align locale keys, drop advisory refs, add decimal_locale message - Align negative_amount_tendered '=> with all other keys (46 locale files) - Remove docblock + inline comment above decrementGiftcardValue() - Remove GHSA ID and attack-detail description from test; scrub redundant comment - Add decimal_locale message override + focused malformed-amount test * Fix formatting and spacing in SalesControllerTest * fix(lang): remove duplicate negative amount tendered key Consolidate 'negative_amount_invalid' and 'negative_amount_tendered' translation keys in Sales.php across all locale files. Both keys held identical messages, causing redundant translation maintenance. - Drop 'negative_amount_invalid' key, keep 'negative_amount_tendered' - Move existing translated text into 'negative_amount_tendered' where it was previously empty - Applied across all app/Language/*/Sales.php locale files Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> * fix(sales): allow negative amount_tendered in return mode Return transactions legitimately produce negative amount_due and prefilled amount_tendered values, but validation rules previously enforced nonNegativeDecimal unconditionally, blocking valid returns. - Detect return mode via sale_lib->get_mode() in Sales::process - Build amount_tendered rule conditionally: skip nonNegativeDecimal check when in return mode, keep it for sale/giftcard flows - Apply the conditional rule to both giftcard and standard payment branches Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> * test: update expected error message in negative payment test Sales controller now returns generic numeric-validation message instead of specific negative-amount message for negative tendered amounts. Update test assertion to match new lang key. - tests/Controllers/SalesControllerTest.php: assert Sales.must_enter_numeric instead of Sales.negative_amount_tendered Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> * test: remove regression tests for GHSA-9847 negative amount fix Drop testDecrementGiftcardValueRejectsNegativeAmount and testDecrementGiftcardValueRejectsZeroAmount from GiftcardTest. - Remove coverage for decrementGiftcardValue() rejecting non-positive amounts (negative/zero) in tests/Models/GiftcardTest.php Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> --------- Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> Co-authored-by: objecttothis <17935339+objecttothis@users.noreply.github.com>
240 lines
15 KiB
PHP
240 lines
15 KiB
PHP
<?php
|
|
|
|
return [
|
|
'account_number' => 'Broj računa',
|
|
'add_payment' => 'Plaćanje',
|
|
'amount_due' => 'Iznos duga',
|
|
'amount_due_not_covered' => 'Uplate ne pokrivaju dospjeli iznos.',
|
|
'amount_tendered' => 'Ponuđeni iznos',
|
|
'authorized_signature' => 'Ovlašćeni potpis',
|
|
'cancel_sale' => 'Otkaži',
|
|
'cash' => 'Gotovina',
|
|
'cash_1' => '',
|
|
'cash_2' => '',
|
|
'cash_3' => '',
|
|
'cash_4' => '',
|
|
'cash_adjustment' => 'Usklađivanje gotovine',
|
|
'cash_deposit' => 'Polog gotovine',
|
|
'cash_filter' => 'Gotovina',
|
|
'change_due' => 'Kusur',
|
|
'change_price' => 'Promjena prodajne cijene',
|
|
'check' => 'Ček',
|
|
'check_balance' => 'Provjeri razliku',
|
|
'check_filter' => 'Ček',
|
|
'close' => '',
|
|
'comment' => 'Komentar',
|
|
'comments' => 'Komentari',
|
|
'company_name' => '',
|
|
'complete' => '',
|
|
'complete_sale' => 'Završeno',
|
|
'confirm_cancel_sale' => 'Da li ste sigurni da želite da očistite ovu prodaju? Sve stavke će biti izbrisane.',
|
|
'confirm_delete' => 'Da li ste sigurni da želite da izbrišete izabranu prodaju?',
|
|
'confirm_restore' => 'Da li ste sigurni da želite da vratite izabranu prodaju?',
|
|
'credit' => 'Kreditna kartica',
|
|
'credit_deposit' => 'Kreditni depozit',
|
|
'credit_filter' => 'Kreditna kartica',
|
|
'current_table' => '',
|
|
'customer' => 'Kupac',
|
|
'customer_address' => 'Adresa kupca',
|
|
'customer_discount' => 'Popust',
|
|
'customer_email' => 'E-mail kupca',
|
|
'customer_location' => 'Mjesto kupca',
|
|
'customer_mailchimp_status' => 'Status MailChimp-a',
|
|
'customer_optional' => '(Potrebno za odloženo plaćanje)',
|
|
'customer_required' => 'Obavezno',
|
|
'customer_total' => 'Ukupno',
|
|
'customer_total_spent' => '',
|
|
'customers_available_points' => 'Dostupni poeni',
|
|
'daily_sales' => '',
|
|
'date' => 'Datum prodaje',
|
|
'date_range' => 'Period',
|
|
'date_required' => 'Morate unijeti ispravan datum.',
|
|
'date_type' => 'Datum je obavezno polje.',
|
|
'debit' => 'Dugovna kartica',
|
|
'debit_filter' => '',
|
|
'delete' => 'Dozvoli brisanje',
|
|
'delete_confirmation' => 'Da li ste sigurni da želite da izbrišete ovu prodaju? Ova radnja se ne može opozvati.',
|
|
'delete_entire_sale' => 'Izbriši cijelu prodaju',
|
|
'delete_successful' => 'Prodaja je uspješno izbrisana.',
|
|
'delete_unsuccessful' => 'Brisanje prodaje nije uspjelo.',
|
|
'description_abbrv' => 'Opis',
|
|
'discard' => 'Odbaci',
|
|
'discard_quote' => '',
|
|
'discount' => 'Popust',
|
|
'discount_exceeds_item_total' => '',
|
|
'discount_included' => '% Rabat',
|
|
'discount_percent_exceeds_100' => '',
|
|
'discount_short' => '%',
|
|
'due' => 'Dug',
|
|
'due_filter' => 'Dug',
|
|
'edit' => 'Uredi',
|
|
'edit_item' => 'Uredi artikal',
|
|
'edit_sale' => 'Uredi prodaju',
|
|
'email_receipt' => 'Potvrda putem e-mail',
|
|
'employee' => 'Zaposlenik',
|
|
'entry' => 'Ulaz',
|
|
'error_editing_item' => 'Greška pri uređivanju artikla',
|
|
'find_or_scan_item' => 'Pronađi/Skeniraj artikal',
|
|
'find_or_scan_item_or_receipt' => 'Pronađi/Skeniraj artikal ili priznanicu',
|
|
'giftcard' => 'Poklon kartica',
|
|
'giftcard_balance' => 'Saldo poklon kartice',
|
|
'giftcard_filter' => '',
|
|
'giftcard_number' => 'Broj poklon kartice',
|
|
'group_by_category' => 'Grupiraj po kategoriji',
|
|
'group_by_type' => 'Grupiraj po tipu',
|
|
'hsn' => 'HSN',
|
|
'id' => 'ID prodaje',
|
|
'include_prices' => 'Uključi cijene?',
|
|
'insufficient_giftcard_balance' => 'Nezadovoljavajući saldo poklon kartice za ovu uplatu.',
|
|
'insufficient_reward_points' => 'Nedovoljna nagradna bodova za ovu uplatu.',
|
|
'invoice' => 'Faktura',
|
|
'invoice_confirm' => 'Ova faktura će biti poslata na',
|
|
'invoice_enable' => 'Broj fakture',
|
|
'invoice_filter' => 'Fakture',
|
|
'invoice_no_email' => 'Kupac nema važeću adresu e-pošte.',
|
|
'invoice_number' => 'Broj fakture',
|
|
'invoice_number_duplicate' => 'Broj fakture {0} mora biti jedinstven.',
|
|
'invoice_sent' => 'Faktura poslata',
|
|
'invoice_total' => 'Ukupan iznos fakture',
|
|
'invoice_type_custom_invoice' => 'Prilagođena faktura (custom_invoice.php)',
|
|
'invoice_type_custom_tax_invoice' => 'Prilagođena poreska faktura (custom_tax_invoice.php)',
|
|
'invoice_type_invoice' => 'Faktura (invoice.php)',
|
|
'invoice_type_tax_invoice' => 'Poreska faktura (tax_invoice.php)',
|
|
'invoice_unsent' => 'Faktura nije poslata',
|
|
'invoice_update' => 'Ažuriranje',
|
|
'item_insufficient_of_stock' => 'Artikla nema dovoljno na zalihi.',
|
|
'item_name' => 'Naziv artikla',
|
|
'item_number' => 'Barkod',
|
|
'item_out_of_stock' => 'Artikal je rasprodan.',
|
|
'key_browser' => '',
|
|
'key_cancel' => 'Cancels Current Quote/Invoice/Sale',
|
|
'key_customer_search' => 'Customer Search',
|
|
'key_finish_quote' => 'Finish Quote/Invoice witdout payment',
|
|
'key_finish_sale' => 'Add Payment and Complete Invoice/Sale',
|
|
'key_full' => '',
|
|
'key_function' => 'Function',
|
|
'key_help' => 'Shortcuts',
|
|
'key_help_modal' => 'Open Shortcuts Window',
|
|
'key_in' => '',
|
|
'key_item_search' => 'Item Search',
|
|
'key_out' => '',
|
|
'key_payment' => 'Add Payment',
|
|
'key_print' => '',
|
|
'key_restore' => '',
|
|
'key_search' => '',
|
|
'key_suspend' => 'Suspend Current Sale',
|
|
'key_suspended' => 'Show Suspended Sales',
|
|
'key_system' => '',
|
|
'key_tendered' => 'Edit Amount Tendered',
|
|
'key_title' => 'Sales Keyboard Shortcuts',
|
|
'mc' => '',
|
|
'mode' => 'Mod registrovanja',
|
|
'must_enter_numeric' => 'Ponuđeni iznos mora biti broj.',
|
|
'must_enter_numeric_giftcard' => 'Broj poklon kartice mora biti broj.',
|
|
'must_enter_reference_code' => 'Referentni/broj za preuzimanje mora biti unesen.',
|
|
'negative_amount_tendered' => 'Ponuđeni iznos ne može biti negativan.',
|
|
'negative_discount_invalid' => '',
|
|
'negative_price_invalid' => '',
|
|
'negative_quantity_invalid' => '',
|
|
'negative_total_invalid' => '',
|
|
'new_customer' => 'Novi kupac',
|
|
'new_item' => 'Novi artikal',
|
|
'no_description' => 'Nema opisa',
|
|
'no_filter' => 'Svi',
|
|
'no_items_in_cart' => 'Nema artikala u korpi.',
|
|
'no_sales_to_display' => 'Nema prodaje za prikaz.',
|
|
'none_selected' => 'Niste izabrali nijedu prodaju za brisanje.',
|
|
'nontaxed_ind' => ' ',
|
|
'not_authorized' => 'Ova radnja nije ovlašćena.',
|
|
'one_or_multiple' => 'Prodaja',
|
|
'payment' => 'Tip plaćanja',
|
|
'payment_amount' => 'Iznos',
|
|
'payment_not_cover_total' => 'Iznos plaćanja mora biti veći ili jednak ukupnom iznosu.',
|
|
'payment_type' => 'Tip',
|
|
'payments' => '',
|
|
'payments_total' => 'Ukupno plaćeno',
|
|
'price' => 'Cijena',
|
|
'print_after_sale' => 'Štampaj poslije prodaje',
|
|
'quantity' => 'Količina',
|
|
'quantity_less_than_reorder_level' => 'Upozorenje! Željena količina je ispod minimalne.',
|
|
'quantity_less_than_zero' => 'Upozorenje: Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.',
|
|
'quantity_of_items' => 'Količina od {0} stavke(i)',
|
|
'quote' => 'Ponuda',
|
|
'quote_number' => 'Broj ponude',
|
|
'quote_number_duplicate' => 'Broj ponude mora biti jedinstven.',
|
|
'quote_sent' => 'Ponuda poslata na',
|
|
'quote_unsent' => 'Ponuda nije poslata na',
|
|
'receipt' => 'Račun',
|
|
'receipt_no_email' => 'Ovaj kupac nema važeću e-mail adresu.',
|
|
'receipt_number' => 'Rasprodaja #',
|
|
'receipt_sent' => 'Račun poslat',
|
|
'receipt_unsent' => 'Račun nije poslat',
|
|
'reference_code' => 'Referentni kod plaćanja',
|
|
'reference_code_invalid_characters' => 'Referentni kod smije sadržavati samo slova i brojeve.',
|
|
'reference_code_length_error' => 'Duljina referentnog koda nije ispravna.',
|
|
'refund' => 'Tip povrata',
|
|
'register' => 'Registar prodaje',
|
|
'remove_customer' => 'Uklonite kupca',
|
|
'remove_discount' => '',
|
|
'return' => 'Povrat',
|
|
'rewards' => 'Nagradni bodovi',
|
|
'rewards_balance' => 'Bilans nagradnih bodova',
|
|
'rewards_package' => 'Nagrade',
|
|
'rewards_remaining_balance' => 'Preostala vrijednost nagradnih bodova je ',
|
|
'sale' => 'Prodaja',
|
|
'sale_by_invoice' => 'Prodaja po fakturi',
|
|
'sale_for_customer' => 'Kupac:',
|
|
'sale_time' => 'Vrijeme',
|
|
'sales_tax' => 'Porez na promet',
|
|
'sales_total' => '',
|
|
'select_customer' => 'Odaberi kupca',
|
|
'send_invoice' => 'Pošalji fakturu',
|
|
'send_quote' => 'Pošalji ponudu',
|
|
'send_receipt' => 'Pošalji račun',
|
|
'send_work_order' => 'Pošalji radni nalog',
|
|
'serial' => 'Serijski broj',
|
|
'service_charge' => '',
|
|
'show_due' => '',
|
|
'show_invoice' => 'Pokaži fakturu',
|
|
'show_receipt' => 'Pokaži račun',
|
|
'start_typing_customer_name' => 'Počnite upisivati naziv kupca ...',
|
|
'start_typing_item_name' => 'Počnite upisivati naziv artikla ili skenirajte barkod...',
|
|
'stock' => 'Zaliha',
|
|
'stock_location' => 'Lokacija skladišta',
|
|
'sub_total' => 'Međuzbir',
|
|
'successfully_deleted' => 'Uspješno ste izbrisali',
|
|
'successfully_restored' => 'Uspješno ste obnovili',
|
|
'successfully_suspended_sale' => 'Obustava prodaje je uspjela.',
|
|
'successfully_updated' => 'Prodaja je uspješno ažurirana.',
|
|
'suspend_sale' => 'Obustavi',
|
|
'suspended_doc_id' => 'Dokument',
|
|
'suspended_sale_id' => 'ID',
|
|
'suspended_sales' => 'Obustavljeno',
|
|
'table' => 'Sto',
|
|
'takings' => 'Dnevna prodaja',
|
|
'tax' => 'Porez',
|
|
'tax_id' => 'Porez Id',
|
|
'tax_invoice' => 'Poreska faktura',
|
|
'tax_percent' => 'Porez %',
|
|
'taxed_ind' => 'P',
|
|
'total' => 'Ukupno',
|
|
'total_tax_exclusive' => 'Porez isključen',
|
|
'transaction_failed' => 'Obrada nije ispravna.',
|
|
'unable_to_add_item' => 'Dodavanje artikla u rasprodaju nije uspjelo',
|
|
'unsuccessfully_deleted' => 'Brisanje prodaje nije uspjelo.',
|
|
'unsuccessfully_restored' => 'Obnova prodaje(a) nije uspjela.',
|
|
'unsuccessfully_suspended_sale' => 'Obustava prodaje nije uspjela.',
|
|
'unsuccessfully_updated' => 'Ažuriranje prodaje nije uspjelo.',
|
|
'unsuspend' => 'Odustani',
|
|
'unsuspend_and_delete' => 'Akcija',
|
|
'update' => 'Ažuriranje',
|
|
'upi' => 'UPI',
|
|
'visa' => '',
|
|
'wholesale' => '',
|
|
'work_order' => 'Radni nalog',
|
|
'work_order_number' => 'Broj radnog naloga',
|
|
'work_order_number_duplicate' => 'Broj radnog naloga mora biti jedinstven.',
|
|
'work_order_sent' => 'Radni nalog poslat na',
|
|
'work_order_unsent' => 'Slanje radnog naloga nije uspjelo',
|
|
];
|