mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-27 19:51:09 -04:00
Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes
This commit is contained in:
@ -3,7 +3,6 @@ namespace Crater;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Crater\State;
|
||||
use Crater\Country;
|
||||
|
||||
class City extends Model
|
||||
{
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
namespace Crater;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Crater\User;
|
||||
|
||||
class CompanySetting extends Model
|
||||
{
|
||||
|
||||
@ -3,7 +3,6 @@ namespace Crater;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Crater\State;
|
||||
use Crater\Country;
|
||||
|
||||
class Country extends Model
|
||||
{
|
||||
|
||||
@ -218,6 +218,7 @@ class Estimate extends Model
|
||||
if ($estimate->taxes()->exists()) {
|
||||
$estimate->taxes()->delete();
|
||||
}
|
||||
|
||||
$estimate->delete();
|
||||
|
||||
return true;
|
||||
|
||||
@ -2,21 +2,14 @@
|
||||
namespace Crater\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Crater\Expense;
|
||||
use Crater\Http\Requests;
|
||||
use Crater\Invoice;
|
||||
use Crater\Payment;
|
||||
use Crater\PdfSetting;
|
||||
use PDF;
|
||||
use Crater\Currency;
|
||||
use Crater\CompanySetting;
|
||||
use Crater\Estimate;
|
||||
use Crater\Item;
|
||||
use Crater\User;
|
||||
use Crater\Company;
|
||||
use Crater\InvoiceTemplate;
|
||||
use Crater\EstimateTemplate;
|
||||
use Auth;
|
||||
use Crater\Mail\EstimateViewed;
|
||||
use Crater\Mail\InvoiceViewed;
|
||||
|
||||
|
||||
@ -108,6 +108,7 @@ class Item extends Model
|
||||
if ($item->estimateItems()->exists() && $item->estimateItems()->count() > 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$item->delete();
|
||||
|
||||
return true;
|
||||
|
||||
@ -18,7 +18,7 @@ class Updater
|
||||
$data = null;
|
||||
$path = null;
|
||||
|
||||
$url = '/downloads/file/'.$version.'?type=update';
|
||||
$url = 'https://craterapp.com/downloads/file/'.$version.'?type=update';
|
||||
|
||||
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
||||
|
||||
@ -99,7 +99,7 @@ class Updater
|
||||
public static function checkForUpdate()
|
||||
{
|
||||
$data = null;
|
||||
$url = '/downloads/check/latest/'.Setting::getSetting('version');
|
||||
$url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version');
|
||||
|
||||
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
||||
|
||||
|
||||
@ -239,6 +239,7 @@ class User extends Authenticatable implements HasMedia
|
||||
if ($customer->addresses()->exists()) {
|
||||
$customer->addresses()->delete();
|
||||
}
|
||||
|
||||
$customer->delete();
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user