Fixed recurring update issue..
This commit is contained in:
parent
8359383ba9
commit
939d2b726a
|
|
@ -17,6 +17,7 @@ use App\Models\Setting\Tax;
|
||||||
use App\Traits\Currencies;
|
use App\Traits\Currencies;
|
||||||
use App\Traits\DateTime;
|
use App\Traits\DateTime;
|
||||||
use App\Traits\Transactions as TransactionsTrait;
|
use App\Traits\Transactions as TransactionsTrait;
|
||||||
|
use App\Utilities\Date;
|
||||||
|
|
||||||
class RecurringTransactions extends Controller
|
class RecurringTransactions extends Controller
|
||||||
{
|
{
|
||||||
|
|
@ -99,7 +100,11 @@ class RecurringTransactions extends Controller
|
||||||
*/
|
*/
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$response = $this->ajaxDispatch(new CreateTransaction($request->merge(['paid_at' => $request->get('recurring_started_at')])));
|
$paid_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['paid_at' => $paid_at]);
|
||||||
|
|
||||||
|
$response = $this->ajaxDispatch(new CreateTransaction($request->merge(['paid_at' => $paid_at])));
|
||||||
|
|
||||||
if ($response['success']) {
|
if ($response['success']) {
|
||||||
$response['redirect'] = route('recurring-transactions.show', $response['data']->id);
|
$response['redirect'] = route('recurring-transactions.show', $response['data']->id);
|
||||||
|
|
@ -203,7 +208,11 @@ class RecurringTransactions extends Controller
|
||||||
*/
|
*/
|
||||||
public function update(Transaction $recurring_transaction, Request $request)
|
public function update(Transaction $recurring_transaction, Request $request)
|
||||||
{
|
{
|
||||||
$response = $this->ajaxDispatch(new UpdateTransaction($recurring_transaction, $request->merge(['paid_at' => $request->get('recurring_started_at')])));
|
$paid_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['paid_at' => $paid_at]);
|
||||||
|
|
||||||
|
$response = $this->ajaxDispatch(new UpdateTransaction($recurring_transaction, $request));
|
||||||
|
|
||||||
if ($response['success']) {
|
if ($response['success']) {
|
||||||
$response['redirect'] = route('recurring-transactions.show', $recurring_transaction->id);
|
$response['redirect'] = route('recurring-transactions.show', $recurring_transaction->id);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ use App\Jobs\Document\UpdateDocument;
|
||||||
use App\Models\Common\Recurring;
|
use App\Models\Common\Recurring;
|
||||||
use App\Models\Document\Document;
|
use App\Models\Document\Document;
|
||||||
use App\Traits\Documents;
|
use App\Traits\Documents;
|
||||||
|
use App\Utilities\Date;
|
||||||
|
|
||||||
class RecurringBills extends Controller
|
class RecurringBills extends Controller
|
||||||
{
|
{
|
||||||
|
|
@ -80,7 +81,11 @@ class RecurringBills extends Controller
|
||||||
*/
|
*/
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')])));
|
$issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['issued_at' => $issue_at]);
|
||||||
|
|
||||||
|
$response = $this->ajaxDispatch(new CreateDocument($request));
|
||||||
|
|
||||||
if ($response['success']) {
|
if ($response['success']) {
|
||||||
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
|
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
|
||||||
|
|
@ -163,7 +168,11 @@ class RecurringBills extends Controller
|
||||||
*/
|
*/
|
||||||
public function update(Document $recurring_bill, Request $request)
|
public function update(Document $recurring_bill, Request $request)
|
||||||
{
|
{
|
||||||
$response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, $request->merge(['issued_at' => $request->get('recurring_started_at')])));
|
$issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['issued_at' => $issue_at]);
|
||||||
|
|
||||||
|
$response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, $request));
|
||||||
|
|
||||||
if ($response['success']) {
|
if ($response['success']) {
|
||||||
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
|
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ use App\Jobs\Document\UpdateDocument;
|
||||||
use App\Models\Common\Recurring;
|
use App\Models\Common\Recurring;
|
||||||
use App\Models\Document\Document;
|
use App\Models\Document\Document;
|
||||||
use App\Traits\Documents;
|
use App\Traits\Documents;
|
||||||
|
use App\Utilities\Date;
|
||||||
|
|
||||||
class RecurringInvoices extends Controller
|
class RecurringInvoices extends Controller
|
||||||
{
|
{
|
||||||
|
|
@ -80,7 +81,9 @@ class RecurringInvoices extends Controller
|
||||||
*/
|
*/
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$request->merge(['issued_at' => $request->get('recurring_started_at')]);
|
$issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['issued_at' => $issue_at]);
|
||||||
|
|
||||||
$response = $this->ajaxDispatch(new CreateDocument($request));
|
$response = $this->ajaxDispatch(new CreateDocument($request));
|
||||||
|
|
||||||
|
|
@ -165,7 +168,9 @@ class RecurringInvoices extends Controller
|
||||||
*/
|
*/
|
||||||
public function update(Document $recurring_invoice, Request $request)
|
public function update(Document $recurring_invoice, Request $request)
|
||||||
{
|
{
|
||||||
$request->merge(['issued_at' => $request->get('recurring_started_at')]);
|
$issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
|
||||||
|
|
||||||
|
$request->merge(['issued_at' => $issue_at]);
|
||||||
|
|
||||||
$response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request));
|
$response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue