TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'increase-series-length'

Browse Source
This commit is contained in:
Mohit Panjwani
2021-12-29 18:20:44 +05:30
parent a20c0a5ef9 d2dcc44817
commit 02aabacd50
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/SerialNumberFormatter.php
View File

@ -156,7 +156,7 @@ class SerialNumberFormatter
public static function getPlaceholders(string $format) public static function getPlaceholders(string $format)
{ {
$regex = "/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,4}|.{1})?}}/"; $regex = "/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,6}|.{1})?}}/";
preg_match_all($regex, $format, $placeholders); preg_match_all($regex, $format, $placeholders);
array_shift($placeholders); array_shift($placeholders);

6
resources/scripts/locales/en.json
View File

@ -861,7 +861,7 @@
"component": "Component", "component": "Component",
"Parameter": "Parameter", "Parameter": "Parameter",
"series": "Series", "series": "Series",
"series_description": "To set a static prefix/postfix like 'INV' across your company. It supports character length of up to 4 chars.", "series_description": "To set a static prefix/postfix like 'INV' across your company. It supports character length of up to 6 chars.",
"series_param_label": "Series Value", "series_param_label": "Series Value",
"delimiter": "Delimiter", "delimiter": "Delimiter",
"delimiter_description": "Single character for specifying the boundary between 2 separate components. By default its set to -", "delimiter_description": "Single character for specifying the boundary between 2 separate components. By default its set to -",
@ -870,7 +870,7 @@
"date_format_description": "A local date and time field which accepts a format parameter. The default format: 'Y' renders the current year.", "date_format_description": "A local date and time field which accepts a format parameter. The default format: 'Y' renders the current year.",
"date_format_param_label": "Format", "date_format_param_label": "Format",
"sequence": "Sequence", "sequence": "Sequence",
"sequence_description": "Consecutive sequence of numbers across your company. You can specify the length on the given paramter.", "sequence_description": "Consecutive sequence of numbers across your company. You can specify the length on the given parameter.",
"sequence_param_label": "Sequence Length", "sequence_param_label": "Sequence Length",
"customer_series": "Customer Series", "customer_series": "Customer Series",
"customer_series_description": "To set a different prefix/postfix for each customer.", "customer_series_description": "To set a different prefix/postfix for each customer.",
@ -878,7 +878,7 @@
"customer_sequence_description": "Consecutive sequence of numbers for each of your customer.", "customer_sequence_description": "Consecutive sequence of numbers for each of your customer.",
"customer_sequence_param_label": "Sequence Length", "customer_sequence_param_label": "Sequence Length",
"random_sequence": "Random Sequence", "random_sequence": "Random Sequence",
"random_sequence_description": "Random alphanumeric string. You can specify the length on the given paramter.", "random_sequence_description": "Random alphanumeric string. You can specify the length on the given parameter.",
"random_sequence_param_label": "Sequence Length", "random_sequence_param_label": "Sequence Length",
"invoices": { "invoices": {
"title": "Invoices", "title": "Invoices",

4
resources/scripts/views/settings/customization/NumberCustomizer.vue
View File

@ -386,8 +386,8 @@ function removeComponent(component) {
function onUpdate(val, element) { function onUpdate(val, element) {
switch (element.name) { switch (element.name) {
case 'SERIES': case 'SERIES':
if (val.length >= 4) { if (val.length >= 6) {
val = val.substring(0, 4) val = val.substring(0, 6)
} }
break break
case 'DELIMITER': case 'DELIMITER':