…ders

Branch v1.2 bugfixes

Fix JUnit tests for AddMemshipCommandParser

Add seedData functionality

Update UG for SeedData, Clear commands

Update Clear command to use --force tag

Create Add Membership Command

…into branch-v1.2

Create AddPointsCommand

# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
#	src/main/java/seedu/address/logic/parser/CliSyntax.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/person/Person.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/main/java/seedu/address/storage/JsonAdaptedPerson.java
#	src/main/java/seedu/address/ui/PersonCard.java
#	src/main/resources/view/PersonListCard.fxml
#	src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
#	src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
#	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
#	src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
#	src/test/java/seedu/address/model/person/PersonTest.java
#	src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
#	src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
#	src/test/java/seedu/address/testutil/PersonBuilder.java
#	src/test/java/seedu/address/testutil/TypicalPersons.java

Orders implementation

Fixed bug for AddMemshipCommand

Improve styling for application

Add orders implementation in DG

Add new fields to BetterModelClassDiagram and ModelClassDiagram

…into update-dg-implementation-points

# Conflicts:
#	docs/DeveloperGuide.md

…into Update-DG-Membership

* 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp: (70 commits)
  Fix checkstyle errors
  Add diagrams for ModelClassDiagrams
  Add new fields to BetterModelClassDiagram and ModelClassDiagram
  Fixed bug
  Add orders implementation in DG
  Improve styling for application
  Fix javadocs comment
  Fix merge issues
  Fix checkstyle errors
  Fix checkstyle errors
  Fix checkstyle errors
  Fix JUnit tests for AddMemshipCommandParser
  Add new testcases
  Fix bugs and checkstyle errors
  Fix checkstyle error
  Fix checkstyle error
  Fix bugs
  Add test cases for order parsing
  Fix styling and add defensive copy of TypicalPersons
  Add test cases for AddOrderCommand
  ...

# Conflicts:
#	docs/DeveloperGuide.md

…n-points

Add points implementation in DG

Update DG with Membership

Update most of the parser logic for addorder command to fit new orders

Minor QOL changes

Change seedData COMMAND_WORD to seeddata

Add tracking of membership points to SweetRewards

…ME to standardise the commands

Update addmempts to take in n/NAME

…into branch-v1.3-create-allergens

Update UG to be consistent with v1.2

# Conflicts:
#	docs/UserGuide.md
#	src/main/java/seedu/address/logic/commands/AddCommand.java
#	src/main/java/seedu/address/logic/commands/EditCommand.java

…into item-integration