diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php index 17677a69c..8d709b0db 100644 --- a/app/Abstracts/Import.php +++ b/app/Abstracts/Import.php @@ -107,35 +107,53 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow protected function replaceForBatchRules(array $rules): array { $dependent_rules = [ - 'after', - 'after_or_equal', - 'before', - 'before_or_equal', - 'different', - 'exclude_if', - 'exclude_unless', - 'gt', - 'gte', - 'in_array', - 'lt', - 'lte', - 'prohibited_if', - 'prohibited_unless', - 'required_if', - 'required_unless', - 'required_with', - 'required_with_all', - 'required_without', - 'required_without_all', - 'same', + 'after:', + 'after_or_equal:', + 'before:', + 'before_or_equal:', + 'different:', + 'exclude_if:', + 'exclude_unless:', + 'gt:', + 'gte:', + 'in_array:', + 'lt:', + 'lte:', + 'prohibited_if:', + 'prohibited_unless:', + 'required_if:', + 'required_unless:', + 'required_with:', + 'required_with_all:', + 'required_without:', + 'required_without_all:', + 'same:', ]; - foreach ($rules as $field => $rule) { - foreach ($dependent_rules as $dependent_rule) { - $rules[$field] = Str::replaceFirst($dependent_rule . ':', $dependent_rule . ':*.', $rules[$field]); - } - } + $batch_rules = [ + 'after:*.', + 'after_or_equal:*.', + 'before:*.', + 'before_or_equal:*.', + 'different:*.', + 'exclude_if:*.', + 'exclude_unless:*.', + 'gt:*.', + 'gte:*.', + 'in_array:*.', + 'lt:*.', + 'lte:*.', + 'prohibited_if:*.', + 'prohibited_unless:*.', + 'required_if:*.', + 'required_unless:*.', + 'required_with:*.', + 'required_with_all:*.', + 'required_without:*.', + 'required_without_all:*.', + 'same:*.', + ]; - return $rules; + return str_replace($dependent_rules, $batch_rules, $rules); } } diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php index f6976d68f..39882ff62 100644 --- a/app/Http/Controllers/Sales/Customers.php +++ b/app/Http/Controllers/Sales/Customers.php @@ -327,4 +327,11 @@ class Customers extends Controller return redirect()->route('invoices.create')->withInput($data); } + + public function createRevenue(Contact $customer) + { + $data['contact'] = $customer; + + return redirect()->route('revenues.create')->withInput($data); + } } diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index abd2966dd..8af5322c4 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -1,5 +1,5 @@