diff --git a/apps/booking/migrations/0001_initial.py b/apps/booking/migrations/0001_initial.py deleted file mode 100644 index f7d5e919..00000000 --- a/apps/booking/migrations/0001_initial.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-12 17:55 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), - ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), - ('type', models.CharField(choices=[('L', 'Lastable'), ('G', 'GuestOnline')], max_length=2)), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/apps/booking/migrations/0001_initial_squashed_0010_auto_20190920_1206.py b/apps/booking/migrations/0001_initial_squashed_0010_auto_20190920_1206.py new file mode 100644 index 00000000..33131471 --- /dev/null +++ b/apps/booking/migrations/0001_initial_squashed_0010_auto_20190920_1206.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.4 on 2019-10-03 10:38 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + replaces = [('booking', '0001_initial'), ('booking', '0002_booking_user'), ('booking', '0003_auto_20190916_1533'), ('booking', '0004_auto_20190916_1646'), ('booking', '0005_auto_20190918_1308'), ('booking', '0006_booking_country_code'), ('booking', '0007_booking_booking_id'), ('booking', '0008_auto_20190919_2008'), ('booking', '0009_booking_user'), ('booking', '0010_auto_20190920_1206')] + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Booking', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('type', models.CharField(choices=[('L', 'Lastable'), ('G', 'GuestOnline')], max_length=2, verbose_name='Guestonline or Lastable')), + ('booking_user_locale', models.CharField(default='en', max_length=10, verbose_name='booking locale')), + ('restaurant_id', models.PositiveIntegerField(default=None, verbose_name='booking service establishment id')), + ('pending_booking_id', models.TextField(default=None, verbose_name='external service pending booking')), + ('booking_id', models.TextField(db_index=True, default=None, null=True, verbose_name='external service booking id')), + ('user', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='bookings', to=settings.AUTH_USER_MODEL, verbose_name='booking owner')), + ], + options={ + 'abstract': False, + 'verbose_name': 'Booking', + 'verbose_name_plural': 'Booking', + }, + ), + ] diff --git a/apps/booking/migrations/0002_booking_user.py b/apps/booking/migrations/0002_booking_user.py deleted file mode 100755 index 0ee387b7..00000000 --- a/apps/booking/migrations/0002_booking_user.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-14 14:47 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('booking', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='user', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='bookings', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - ] diff --git a/apps/booking/migrations/0003_auto_20190916_1533.py b/apps/booking/migrations/0003_auto_20190916_1533.py deleted file mode 100644 index 448d94e7..00000000 --- a/apps/booking/migrations/0003_auto_20190916_1533.py +++ /dev/null @@ -1,61 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-16 15:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0002_booking_user'), - ] - - operations = [ - migrations.AlterModelOptions( - name='booking', - options={'verbose_name': 'Booking', 'verbose_name_plural': 'Booking'}, - ), - migrations.RemoveField( - model_name='booking', - name='user', - ), - migrations.AddField( - model_name='booking', - name='booked_persons_number', - field=models.PositiveIntegerField(default=2, verbose_name='persons number'), - ), - migrations.AddField( - model_name='booking', - name='booking_date', - field=models.DateField(default=None, verbose_name='booking date'), - ), - migrations.AddField( - model_name='booking', - name='booking_time', - field=models.TimeField(default=None, verbose_name='booking time'), - ), - migrations.AddField( - model_name='booking', - name='booking_user_locale', - field=models.CharField(default='en', max_length=10, verbose_name='booking locale'), - ), - migrations.AddField( - model_name='booking', - name='first_name', - field=models.CharField(default=None, max_length=200, verbose_name='booking first name'), - ), - migrations.AddField( - model_name='booking', - name='last_name', - field=models.CharField(default=None, max_length=200, verbose_name='booking last name'), - ), - migrations.AddField( - model_name='booking', - name='phone', - field=models.CharField(default=None, max_length=20, verbose_name='booking phone'), - ), - migrations.AddField( - model_name='booking', - name='restaurant_id', - field=models.PositiveIntegerField(default=None, verbose_name='booking service establishment id'), - ), - ] diff --git a/apps/booking/migrations/0004_auto_20190916_1646.py b/apps/booking/migrations/0004_auto_20190916_1646.py deleted file mode 100644 index 66471d26..00000000 --- a/apps/booking/migrations/0004_auto_20190916_1646.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-16 16:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0003_auto_20190916_1533'), - ] - - operations = [ - migrations.AlterField( - model_name='booking', - name='first_name', - field=models.CharField(default=None, max_length=200, null=True, verbose_name='booking first name'), - ), - migrations.AlterField( - model_name='booking', - name='last_name', - field=models.CharField(default=None, max_length=200, null=True, verbose_name='booking last name'), - ), - migrations.AlterField( - model_name='booking', - name='phone', - field=models.CharField(default=None, max_length=20, null=True, verbose_name='booking phone'), - ), - migrations.AlterField( - model_name='booking', - name='type', - field=models.CharField(choices=[('L', 'Lastable'), ('G', 'GuestOnline')], max_length=2, verbose_name='Guestonline or Lastable'), - ), - ] diff --git a/apps/booking/migrations/0005_auto_20190918_1308.py b/apps/booking/migrations/0005_auto_20190918_1308.py deleted file mode 100644 index eae448d2..00000000 --- a/apps/booking/migrations/0005_auto_20190918_1308.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-18 13:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0004_auto_20190916_1646'), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='email', - field=models.EmailField(default=None, max_length=254, null=True, verbose_name='Booking email'), - ), - migrations.AddField( - model_name='booking', - name='pending_booking_id', - field=models.TextField(default=None, verbose_name='external service pending booking'), - ), - ] diff --git a/apps/booking/migrations/0006_booking_country_code.py b/apps/booking/migrations/0006_booking_country_code.py deleted file mode 100644 index aed2951e..00000000 --- a/apps/booking/migrations/0006_booking_country_code.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-18 14:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0005_auto_20190918_1308'), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='country_code', - field=models.CharField(default=None, max_length=10, null=True, verbose_name='Country code'), - ), - ] diff --git a/apps/booking/migrations/0007_booking_booking_id.py b/apps/booking/migrations/0007_booking_booking_id.py deleted file mode 100644 index a96aecd1..00000000 --- a/apps/booking/migrations/0007_booking_booking_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-19 20:06 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0006_booking_country_code'), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='booking_id', - field=models.TextField(default=None, null=True, verbose_name='external service booking id'), - ), - ] diff --git a/apps/booking/migrations/0008_auto_20190919_2008.py b/apps/booking/migrations/0008_auto_20190919_2008.py deleted file mode 100644 index 59255422..00000000 --- a/apps/booking/migrations/0008_auto_20190919_2008.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-19 20:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0007_booking_booking_id'), - ] - - operations = [ - migrations.AlterField( - model_name='booking', - name='booking_id', - field=models.TextField(db_index=True, default=None, null=True, verbose_name='external service booking id'), - ), - ] diff --git a/apps/booking/migrations/0009_booking_user.py b/apps/booking/migrations/0009_booking_user.py deleted file mode 100644 index d24162f9..00000000 --- a/apps/booking/migrations/0009_booking_user.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-19 21:18 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('booking', '0008_auto_20190919_2008'), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='user', - field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='bookings', to=settings.AUTH_USER_MODEL, verbose_name='booking owner'), - ), - ] diff --git a/apps/booking/migrations/0010_auto_20190920_1206.py b/apps/booking/migrations/0010_auto_20190920_1206.py deleted file mode 100644 index 95a0ae97..00000000 --- a/apps/booking/migrations/0010_auto_20190920_1206.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-20 12:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('booking', '0009_booking_user'), - ] - - operations = [ - migrations.RemoveField( - model_name='booking', - name='booked_persons_number', - ), - migrations.RemoveField( - model_name='booking', - name='booking_date', - ), - migrations.RemoveField( - model_name='booking', - name='booking_time', - ), - migrations.RemoveField( - model_name='booking', - name='country_code', - ), - migrations.RemoveField( - model_name='booking', - name='email', - ), - migrations.RemoveField( - model_name='booking', - name='first_name', - ), - migrations.RemoveField( - model_name='booking', - name='last_name', - ), - migrations.RemoveField( - model_name='booking', - name='phone', - ), - ] diff --git a/apps/establishment/migrations/0033_auto_20191003_0943_squashed_0034_auto_20191003_1036.py b/apps/establishment/migrations/0033_auto_20191003_0943_squashed_0034_auto_20191003_1036.py new file mode 100644 index 00000000..48a0fa8d --- /dev/null +++ b/apps/establishment/migrations/0033_auto_20191003_0943_squashed_0034_auto_20191003_1036.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.4 on 2019-10-03 10:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('establishment', '0033_auto_20191003_0943'), ('establishment', '0034_auto_20191003_1036')] + + dependencies = [ + ('establishment', '0032_merge_20191001_1530'), + ] + + operations = [ + migrations.RemoveField( + model_name='establishment', + name='lastable_id', + ), + migrations.AddField( + model_name='establishment', + name='lastable_id', + field=models.TextField(blank=True, default=None, null=True, unique=True, verbose_name='lastable id'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index d809d9b5..2c943d39 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -262,7 +262,7 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin): verbose_name=_('Lafourchette URL')) guestonline_id = models.PositiveIntegerField(blank=True, verbose_name=_('guestonline id'), null=True, default=None,) - lastable_id = models.PositiveIntegerField(blank=True, verbose_name=_('lastable id'), + lastable_id = models.TextField(blank=True, verbose_name=_('lastable id'), unique=True, null=True, default=None,) booking = models.URLField(blank=True, null=True, default=None, verbose_name=_('Booking URL')) diff --git a/apps/timetable/migrations/0003_auto_20191003_0943.py b/apps/timetable/migrations/0003_auto_20191003_0943.py new file mode 100644 index 00000000..4c5a22b4 --- /dev/null +++ b/apps/timetable/migrations/0003_auto_20191003_0943.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.4 on 2019-10-03 09:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('timetable', '0002_auto_20190919_1124'), + ] + + operations = [ + migrations.AlterModelOptions( + name='timetable', + options={'ordering': ['weekday'], 'verbose_name': 'Timetable', 'verbose_name_plural': 'Timetables'}, + ), + ] diff --git a/project/settings/base.py b/project/settings/base.py index 9f72ecde..c135a92c 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -266,8 +266,9 @@ SOCIAL_AUTH_FACEBOOK_PROFILE_EXTRA_PARAMS = { # Booking API configuration GUESTONLINE_SERVICE = 'https://api-preprod.guestonline.fr/' GUESTONLINE_TOKEN = 'iiReiYpyojshpPjpmczS' -LASTABLE_SERVICE = '' -LASTABLE_TOKEN = '' +LASTABLE_SERVICE = 'http://34.251.84.222' +LASTABLE_TOKEN = '6dfc608ce5e494' +LASTABLE_PROXY = '' # SMS Settings SMS_EXPIRATION = 5 diff --git a/project/settings/production.py b/project/settings/production.py index 76dc31f0..5682a59d 100644 --- a/project/settings/production.py +++ b/project/settings/production.py @@ -5,4 +5,5 @@ from .base import * GUESTONLINE_SERVICE = 'https://api.guestonline.fr/' GUESTONLINE_TOKEN = '' LASTABLE_SERVICE = '' -LASTABLE_TOKEN = '' \ No newline at end of file +LASTABLE_TOKEN = '' +LASTABLE_PROXY = '' \ No newline at end of file